From nobody Thu Oct 24 11:37:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XZ3mp4mllz5bNDs; Thu, 24 Oct 2024 11:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ3mp409sz3x9m; Thu, 24 Oct 2024 11:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVpAjHJIpqX9AIXtnym1u4rUS3qlW1nFq/R8wOFo2EA=; b=PMpsOFw9hUlo/Weudiq1y9d79B7LvDEPDI8rU+LgiatD/myZpUHEVoxg6xvvF+dB9FRMwi RS1d/s1+f+Bj+EGNLnQhwedJ1CB0QiXg7Nj0oWEFo3FVhVGZq1xJP9NnNCgqp0RXm7f8jr oMVA0XPB0FMgbBOdmlwjFcSOg4rt/iUwImCR2lA/Wpo/C00arOdR1K9OZ61qQ/zS8MhOjD YwxGoCL2M3Z9rZocI0OQ+yFbk2nz9+d6swo65mL2m7Gp4cvwqCyAQbUnGg/fxRE/FygDd7 YnGyaEbHLzvXecB+VNQ59NMEj6QQkkuH3P6xkCcVS5dUjnhYu/kJolZZVQxtnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVpAjHJIpqX9AIXtnym1u4rUS3qlW1nFq/R8wOFo2EA=; b=djXU6CNhrY9ZkV5qtcNEK3myPCkFK0dffDdHXIn0c2e58lwAfX/ykVkkBLJWlHnW+WL6Rt W5F1oeWYuY6KcclNX6gH2Exq2yDgD9XRkDTfhPPHREeZEEGALQrUzGQlyDeDBO82XTOlv0 hGl0bbMcrY0XnMr4GBqs4Qt3PxAjyaXyRSBLXSbiRznlOhGcik88R3wPhVdZw/35ldEQVM yyPtUFibotrgCzE2rUXU/lvEY9AQnIifuz4osAz2UZwlbCQiDDYHLRnMrsXDYtzEbI6RR5 4HpOCh63pPUXaY2MrTYGc/s5SZ0399OeoxPED2DxLQ51p9DVkqcZU8xmAHpVRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729769850; a=rsa-sha256; cv=none; b=KmiJnkoKynAdXrQFkDuiUKL/vHCd/dWmXtbAusVjCVQ85wxG7QD5rpHt+a+n55CojMAXys MYajSCmP+2nMokQ2s0UAGUUoXzrbqzchOhJgdqlhSLjTX8WX/unR2gWeCjFi0hjjb88xRP /lKpf7jxQbV0z+GganBBIEQyMMa19uC3IvSobv2wRDEoJpRsOfUUEj8OEvUhhzOwEf6gQX DosCpNKIWtxhgVAyL/hJanCpjWujGh7cYE2/ZeEj6Whl/j+MkjfKW5d42jZ6NGLQfl3skW ab7Dy0RByqk4qMfuOLaJU6f4OLyb2ATe9u5WSP2IW2+PCroTgsp5qKdhhTMosg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ3mp38ftzgpm; Thu, 24 Oct 2024 11:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OBbUFw071578; Thu, 24 Oct 2024 11:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OBbU1m071575; Thu, 24 Oct 2024 11:37:30 GMT (envelope-from git) Date: Thu, 24 Oct 2024 11:37:30 GMT Message-Id: <202410241137.49OBbU1m071575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 9693241188aa - main - sound: Call DSP_REGISTERED before PCM_DETACHING List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9693241188aa6882166b091d9006f9d0affeda7e Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9693241188aa6882166b091d9006f9d0affeda7e commit 9693241188aa6882166b091d9006f9d0affeda7e Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:01 +0000 Commit: Christos Margiolis CommitDate: 2024-10-24 11:37:01 +0000 sound: Call DSP_REGISTERED before PCM_DETACHING DSP_REGISTERED first checks if the softc is not null, through PCM_REGISTERED, which in turn calls PCM_ALIVE, whereas PCM_DETACHING accesses the softc flags directly. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj, emaste Differential Revision: https://reviews.freebsd.org/D47195 --- sys/dev/sound/pcm/dsp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index d4f7e3d6e63f..6573dfaabf2f 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -196,7 +196,7 @@ dsp_close(void *data) d = priv->sc; /* At this point pcm_unregister() will destroy all channels anyway. */ - if (PCM_DETACHING(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) goto skip; PCM_GIANT_ENTER(d); @@ -301,7 +301,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) return (ENODEV); d = i_dev->si_drv1; - if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); priv = malloc(sizeof(*priv), M_DEVBUF, M_WAITOK | M_ZERO); @@ -485,7 +485,7 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) ("%s(): io train wreck!", __func__)); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -704,7 +704,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -1823,7 +1823,7 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) { + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) { /* XXX many clients don't understand POLLNVAL */ return (events & (POLLHUP | POLLPRI | POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM)); @@ -1905,7 +1905,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EINVAL); PCM_GIANT_ENTER(d);