From nobody Wed Mar 30 20:44:20 2022 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 B7A931A3A1FD; Wed, 30 Mar 2022 20:44:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTJM84Yvrz4SM2; Wed, 30 Mar 2022 20:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648673060; 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=ZTIF+g7w8XscYCFGu14ttGCLGa8u6xHXMbAskwXjbwc=; b=qOThzJn9bvM7KLKBtatNwemLCvpMrsajYq4oFSZFMVbORPmSyhP25Wu5DtDxsXKAZE8DX9 k0ZFcxP4PtCtevaG+kdojL9dugz90vcdd3wibeBAHoVq0yXVzXvxwG0Rrg2mn6ujx5iAQ2 i7FMWo+BNAwJb48H2lZ/9hx2Yh9OgPd1oo5m44p06B6yOYP0ApR1cfZxm4I4bxmx6hqYxx +xHDcPs1XLrWt34i9sWOLFlVeyLQ090Utsx4gz8/A2SV/AfBzFehKomDilKdsxCw8505SW fZi+SGDH5MVV2qeiUWhR9q0LXjDO8rxLZTYHhEoVXvMnYMBB+g4dYU9PrU6/Ng== 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 7CC781A35C; Wed, 30 Mar 2022 20:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22UKiK80024970; Wed, 30 Mar 2022 20:44:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UKiKG4024969; Wed, 30 Mar 2022 20:44:20 GMT (envelope-from git) Date: Wed, 30 Mar 2022 20:44:20 GMT Message-Id: <202203302044.22UKiKG4024969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 74f11a40f8e4 - stable/13 - sound: test PCM_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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 74f11a40f8e4e1b3ae254edf499d467153242ce9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648673060; 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=ZTIF+g7w8XscYCFGu14ttGCLGa8u6xHXMbAskwXjbwc=; b=HGM2wxsXPFY/2TBv2qar+55RaN8/RuwM4GL2jv9WY9ToUWeUuRndIfvlaFWBHtxyuvm52Y N2L6+QXMhbVr3kdI+KjwIKte5y/z3Tc5xv/tiGvICeMBdfS00KYaoCQQkfN8XjoRJbo3kk iH+tCC7nqP2COL2nw45rlRd1eYR1eUAaarv2VCfabg50pTt+qs9/NxOoaMW3IhhM4wXg6f HTa7OknLgFdUImPHr7Wl0U2C6fHugPa9qiFl7+NHo7qPuFPREkNlTXlJxKUVGd7FMhID5o LiO28YMEbilX3yL9km4VnV2LX51YIjq1a2xWCbMT1STK+UwAjWNFzT3rA1SINg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648673060; a=rsa-sha256; cv=none; b=n5N9HeuXEKYUkzIlt+3qjZvvPZoCn04CjsD1ONrTeFOFxveL6uOKeYqwPxR/PrPVsheFqW reHldVh7Z9IU/6VMZIEIkWzZiljPhNCuuGiVevzbCGzu6dWvWArZ2MfdRyZzKfGPFpRA+W aXp7OdL0Abc9FpVMv5zYln0rMJRA8RM7wmgc+uG196F8+WuP6Mn+7szaZ88c/BFjdTuXrJ JB442Z0F3N5zbhZqfheXRHo9D6ro6RlxBZWRSd99riy6p9gsnni2OwlnUEindF9MfbSmk8 VJ7yHlHwpgIGbI76VRUFCSzgQW4v/8UkRgP+SVYLym7DMCZJTir9Dw6THdsU4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=74f11a40f8e4e1b3ae254edf499d467153242ce9 commit 74f11a40f8e4e1b3ae254edf499d467153242ce9 Author: Ed Maste AuthorDate: 2022-03-21 16:15:22 +0000 Commit: Ed Maste CommitDate: 2022-03-30 20:43:57 +0000 sound: test PCM_REGISTERED before PCM_DETACHING PCM_REGISTERED(d) tests that d is not NULL, so perform that check first as we may have cases where devclass_get_softc has a null entry. PR: 262671 Reviewed by: hselasky MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34648 (cherry picked from commit da03ac41c9bca270b491fcf4bf219c4108688a05) --- sys/dev/sound/pcm/mixer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 89e78b036e94..bbc57f737036 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -153,7 +153,7 @@ mixer_set_softpcmvol(struct snd_mixer *m, struct snddev_info *d, struct pcm_channel *c; int dropmtx, acquiremtx; - if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) + if (!PCM_REGISTERED(d) || PCM_DETACHING(d)) return (EINVAL); if (mtx_owned(m->lock)) @@ -206,7 +206,7 @@ mixer_set_eq(struct snd_mixer *m, struct snddev_info *d, else return (EINVAL); - if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) + if (!PCM_REGISTERED(d) || PCM_DETACHING(d)) return (EINVAL); if (mtx_owned(m->lock)) @@ -1083,7 +1083,7 @@ mixer_open(struct cdev *i_dev, int flags, int mode, struct thread *td) m = i_dev->si_drv1; d = device_get_softc(m->dev); - if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) + if (!PCM_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); /* XXX Need Giant magic entry ??? */ @@ -1239,7 +1239,7 @@ mixer_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, return (EBADF); d = device_get_softc(((struct snd_mixer *)i_dev->si_drv1)->dev); - if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) + if (!PCM_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -1460,7 +1460,7 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) for (i = 0; pcm_devclass != NULL && i < devclass_get_maxunit(pcm_devclass); i++) { d = devclass_get_softc(pcm_devclass, i); - if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) + if (!PCM_REGISTERED(d) || PCM_DETACHING(d)) continue; /* XXX Need Giant magic entry */