From nobody Thu Mar 31 00:32:03 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 359B41A3F399; Thu, 31 Mar 2022 00:32:04 +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 4KTPPw0ZBHz4ZW3; Thu, 31 Mar 2022 00:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648686724; 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=UZi6aMGQwQsTw3fA8schAVVN1nji9GZqwTECJPxuPso=; b=yBOXuLXGBnpS47DGkbQyBVNJ2CUoEVXRKWf22HSaJ4zliRlwG2lLzd+J/Gn1v+6BN1S1Cf zMs8Yzd7ps8XRCNDIe/fSggD9zmhfo/TnE7D2oZZoOfdNqP+NsKmlJ3T76veGEDGWTCMF4 1z7gTOv2G2SBUsyhqtfpsLv4EBOOvRMR4PJpwq6H9HOQxZRju4/0jfBE2BsGxa1/KeGB0k rrj1maiCFCcRqM5DoxRt+3d7Fp8p3vLn/fNk2/9BNdU+E9GilCjPnRrTp/ad6gZvoS8ADJ gfcK1As3PExVo+vxi0bLRW8HybXkrEbbgqokvqb4SWZ3aadnlJCKqxHf0rKiAQ== 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 E889F1DB31; Thu, 31 Mar 2022 00:32:03 +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 22V0W3ai040062; Thu, 31 Mar 2022 00:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22V0W3aT040061; Thu, 31 Mar 2022 00:32:03 GMT (envelope-from git) Date: Thu, 31 Mar 2022 00:32:03 GMT Message-Id: <202203310032.22V0W3aT040061@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: aeb4214375b7 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: aeb4214375b7197ccc7c6ad9b2bc3185545eaf8e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648686724; 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=UZi6aMGQwQsTw3fA8schAVVN1nji9GZqwTECJPxuPso=; b=C1NsDms2BXlepbNMVGTTflA1/tnDuJPUCN4ZbYX3dd1hrMwvU/dr/1d8kgb/Qi96yP0bST jCNswRRtTm3cxtCAUpX8Aww5bfS6dSQGR3h2sPlBWplHHb+283Aeib7lGmHvZhqcffcnbe vMkCd134b4YLpmdJT58H1Z2cJNomHm1a7jGYA3v9KcY5Zl+/9QEKHykV8SGEmSQsKeREh6 uNhjVmdKRZuwcSGiws5vHkz3WKzTzpclqgKez0x2LbQtUO0NhSdaiI4aVK3q6iMnOqa6Te GoSgjWzSkJDcXsy1hmhgNL4wKGiJCD3m5D0oPTmENlhWTpExXx6vT77CXdUnOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648686724; a=rsa-sha256; cv=none; b=t3U+KwqlWWLru3oroaF3Zr8j2HceVwHo84PlZRMfMtz6ZFNpdxUpKS8UdptKqg3b3ItRNN tMf54FULdizSi7z5wF+MXS9XV0hA+q5Bbxds27L2hbZX4KXA9rWaY+9OSHYpPWoo3a+tV9 hUOCl6Ue+0WAaBnkxysCOzDrG6FLY4QpQKKLsz2KVtj1N+QTdjSqpvGF7uwBjt6+FI3a5a FJqu11BDWVc42rI0lx2vgdsj3eSblGPIHejbZRq6iABQYWmBjPXQp7ySXOGkR5WBUmodAt ltNiEuwa2YGIOXN0mIQa81k09Gc3Z+Flyes3X3INpkUz8TS1whEySLZXgkm2wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=aeb4214375b7197ccc7c6ad9b2bc3185545eaf8e commit aeb4214375b7197ccc7c6ad9b2bc3185545eaf8e Author: Ed Maste AuthorDate: 2022-03-21 16:15:22 +0000 Commit: Ed Maste CommitDate: 2022-03-31 00:31:44 +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 92c5f3d613e6..bf93146511cf 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)) @@ -1054,7 +1054,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 ??? */ @@ -1210,7 +1210,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); @@ -1419,7 +1419,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 */