From nobody Sun Oct 27 16:33:08 2024 X-Original-To: dev-commits-src-branches@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 4Xc2BY1QLcz5bBxx; Sun, 27 Oct 2024 16:33:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2BY0fGgz4PLH; Sun, 27 Oct 2024 16:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046789; 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=Kg1YLQpvbHbq3R+P4C1frPNcvbeyusBwZem1z0R1fHc=; b=Rwj+cHGD5c9fkjrb4wbYxT1PFyBFpcEmaq475ANDyp8YzpgXbUg/mMv+AZJR7GIgekOPP7 Qz70U8JT8sB8tqyCezykfN5+k+6gKAnjLXfDb0n2RrazkDGB16eZ0R5Ui8YFhRP5V78GSu FKFv6yGbXNT164rgmmQ5UJYVlS+b/8Edg+VT0uFqkiaSzsmsMI54E91BEM9dV7lB0kbk8D Y2GhoOA42lqdmn6dgDKk0ESOdz/tRJc9XJW6K4kCTDCTRLpQfTaUK2dPveopL8Cwg72AE7 dmA/IUJsI10rnlLO6yvjtV4SeKUdIvoGqNwXl3hTv9m580QaL4HOoB6l7F6IRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046789; 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=Kg1YLQpvbHbq3R+P4C1frPNcvbeyusBwZem1z0R1fHc=; b=C8KR9vOiaovO32omsnezxvM/dv3rQoIbEBPhuo77McWoBrqAfZn68ffbwwpU4M18o4157O TAb37NORrSg1eMnyPZHMF61iZz5ksZstfx9Nvm4j5Y2ucBz0mfFPejv1J/q1ZerefThMuJ oUdl9lxrKUhNbWlyB9Fw0OXkCgm98RP0RKTKiKtnTkyKBr6W2ZaT6PgXvK++Wm9XRh124l LgLjZkL6ZGl+gc5SAhInY8tl0aNcxJnUGct6Niz82mC0mR9Q1AqhenAnq34Q6kYU+PRl9/ dzYUtpv4C1sBJ35qRUc0aEYD5RbTfSA8UyNo14QXV0VOfShqV4lylz0QLQ/5uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730046789; a=rsa-sha256; cv=none; b=EhxH/YrSko3BVyK5/3ck82TI+kobMcT5M90M49XwgpuUM5yG5bpsVSCJyujj4JlOoRQo5t ixz+OI6qPSrh3zAvPQupNoT3+jxOimjzRe1aFOIcWW6YUfRelMnXLvdqjuPMhk+wjO45jM l39LXTs8IAiC60Z5MnYyjXB/weBFjou0SZ260q9+hB32ts0BY3u6OvQvp4sVvShbUiqWoL 7MzXW62DWQAuQn7y/zqIPilpNiaAAn4jJ9HUCumJuQHoKOBmlezjM0b5erbujssDzz8KKm +cl7WfJooHIyRT54Cqls4GQlaOjJy3m8rjoVJe3UAOPohXzPNcB06EV15um8FQ== 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 4Xc2BX71c3z12mL; Sun, 27 Oct 2024 16:33:08 +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 49RGX8Ie035323; Sun, 27 Oct 2024 16:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGX8gX035319; Sun, 27 Oct 2024 16:33:08 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:33:08 GMT Message-Id: <202410271633.49RGX8gX035319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ace5484e48c9 - stable/14 - sound: Call DSP_REGISTERED before PCM_DETACHING List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ace5484e48c9c8585cf914963912ee1ebf35327a Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ace5484e48c9c8585cf914963912ee1ebf35327a commit ace5484e48c9c8585cf914963912ee1ebf35327a Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:01 +0000 Commit: Christos Margiolis CommitDate: 2024-10-27 16:32:16 +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 (cherry picked from commit 9693241188aa6882166b091d9006f9d0affeda7e) --- 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);