From nobody Wed May 14 11:44:15 2025 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 4ZyBMM2dMqz5wZVr; Wed, 14 May 2025 11:44:15 +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 4ZyBMM25XMz3h9C; Wed, 14 May 2025 11:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747223055; 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=XDqYDcRteLJL3Ny5YvJyAJmbd+2//3LyfKi8XNOpLwg=; b=Z1ULtRj6++JVw/oFngyydw4JNM1mAMHsUjYfEFlphbA6ivuqCDc76BOZaD+NyFKmloSc08 ivCYU+y4Lkd+VTPhCKyGhc0PWhjFcC7WRDeAhBmDOPob2fztOJS0zOuc5XVv76E5Hx9Vgq L8QtjxbsT8qQY6OtWKk8r9NdZ6A66EMnWblTXTYZF9pClDjhedoEPokHH8YHDX+eBziJyA UQosHht/EmgthDm5A5pvsuu4RteUHh4sma99tIYX75k2sBGDqLbrn6CfsFtZrtTVdWTV0Z nOlo+yc0OZrxFhL1MzQlwmSCGREX+hFnYkvbtM5ZmADw6miIh69jTt2AF6sXOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747223055; 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=XDqYDcRteLJL3Ny5YvJyAJmbd+2//3LyfKi8XNOpLwg=; b=usZVR+weg3nAezV94BBMwE1i7oRt/x2XwHVBKKlQZe1YUdUmSr1PNMfUWd0FtIN1WrPp12 2IQGgmsbRPUph+mFg0uN+NSW4C9D0yifdIe8s6qbLQXqvEkZXqAYpNVJSnfmG6G48/08TO AMqwrEhPWv1+7PB0hAgGxZz7j2whHV6J46dGtCdP5AHrkpvXZc5G4+2m7QWhTJhUIq5tra eYt3wZPyfemaLlG9g+yeMgzVyrTe9A8fChnE0Gp+qI1db54O33Rd/2ECatavKBhu1+q243 jTeHlPHvytCgUSFTgtfF9gWtzNCbrcmj3HQwyEOalCnS3YRCGoo+Av3lvhzZhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747223055; a=rsa-sha256; cv=none; b=vi+rYJ3eXY9Uy2O9EJOKj5Zk5byelmkixCAQ0pbU3y9AXXY708T+U0FBpouKLQbGsTTfTn bzRuZH+voyDDQK5B1LoclKvD0u79YuMaS459pa2kMGtxViP1Ss3J+dGp3q12gxQdIfJ6T/ 25wrBMCZM0rzXTsrQKIuWzgRX8vIXTqdcwnRXBagiAv3NxEomWFAuyZlEkP0Csp6Htl2xo cErU0ZT0MeVahgQtEpdV0NfaoqQ7qK6F64M6S8XAx+OxdG99Bb13kdq8nEToSbJiEUaiUW yWrCA4GPsQDh3S5Kvv+yRUUl+vn+X9d5MS6Zz+u0JBIS+x4F6MABZckc1U8BIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZyBMM1ZH1zWwm; Wed, 14 May 2025 11:44:15 +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 54EBiFVq060208; Wed, 14 May 2025 11:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EBiFKI060205; Wed, 14 May 2025 11:44:15 GMT (envelope-from git) Date: Wed, 14 May 2025 11:44:15 GMT Message-Id: <202505141144.54EBiFKI060205@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: 3de66f369c1e - stable/14 - sound: Call PCM_RELEASE() if pcm_addchan() fails 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3de66f369c1e8db46ae938d446a72f6ff3493356 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3de66f369c1e8db46ae938d446a72f6ff3493356 commit 3de66f369c1e8db46ae938d446a72f6ff3493356 Author: Christos Margiolis AuthorDate: 2025-05-13 22:02:41 +0000 Commit: Christos Margiolis CommitDate: 2025-05-14 11:42:05 +0000 sound: Call PCM_RELEASE() if pcm_addchan() fails Fixes: fd906e47b18f ("sound: Simplify locking during device creation") Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50337 (cherry picked from commit dbfe79bbe5d5ebe296fbff2d101e0994d7881d0d) --- sys/dev/sound/pcm/sound.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 794e1586b511..cfac8f73990d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -139,6 +139,7 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) { struct snddev_info *d = device_get_softc(dev); struct pcm_channel *ch; + int err = 0; PCM_LOCK(d); PCM_WAIT(d); @@ -147,13 +148,12 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) if (!ch) { device_printf(d->dev, "chn_init(%s, %d, %p) failed\n", cls->name, dir, devinfo); - PCM_UNLOCK(d); - return (ENODEV); + err = ENODEV; } PCM_RELEASE(d); PCM_UNLOCK(d); - return (0); + return (err); } static void