From nobody Wed May 14 14:24:07 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 4ZyFvr01D5z5wmGK; Wed, 14 May 2025 14:24:08 +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 4ZyFvq6bnJz3vhS; Wed, 14 May 2025 14:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747232647; 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=86u0D1xHQXA4xBrYVO29gxrJ6AYXOWy31731Ajo9Qp8=; b=nxs3MXKdSYu0QNN+xAUDLkFXnTgItbkb/VqRq2FTke1j30tRVUz9EhemKhDvdcDUYSjMHR F6GbRE5uXZrk1y+hXf49pudvI0WuzArLIISVmBKy/rgHsJsJfjHd8/1O/feGorA9glPULx JkWtJu2mvUEdDg0e/us8yYMSbDf8ecNc13346lil7enAZYHx/PU5jn80cng5nAoiWc+x4m YSDC2T4eU7//YB+PKZgQ+azulQZxaeTtT6Zvr1tflIlZ3A7aD3DAZmRRg9v3cPVoRr1qnH CUajXh49sKVdECoZ+WxxTG0Uo2trPqflAnsbFs0+lGyKu5rh5wll6bSJ29E1kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747232647; 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=86u0D1xHQXA4xBrYVO29gxrJ6AYXOWy31731Ajo9Qp8=; b=wJglFSyu1ctF3zPK6A7MSZe7bSMna/8yqaoktUTXmWdJ1foiWXY2wpFu8mj45LJwZSKq1z 0tfOTru/Sxpqe1ZnNgs9+ace7ax+z6TWjUDzNuxn2AXR/ewJSc87KSFmRNRdqtKGiIqlTg 2PpSu37wu8EN1u8oBrvMk+Gnqo8jcOf8LDiCOM8kUPflcX+5blkgDpdx320nBEn9mRjfox kk/0MuFtDmgnvbV7m8pCIv7Rh6GBoa5O4ziQrzOndJSj0CRBmRlGfSBlsUXXwltxFFBOUy m9w5XcbguRcmrTnblYMV90w6S1C2G3ZBpKJTrWq/JHIndsyV6UUL+31RubGCyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747232647; a=rsa-sha256; cv=none; b=x4n9g2U2uVEouHUx49cM8fdBBPVriaqJPfWnBSHccnBt/AhJJExWjwdam6B4t3GkhmL9xW yBwhG4vVE/TGdl9ZdjRoreyolYjzvWmUMvE/ARxuiaJN99koAgmByYde4CSVHz5LoqyXUr RPIq8oXT0VkxkioTS3eG1Dn09dcGWfUtzZ4bRklp0B52i1X4TbPULcc+dvlsL0QVD1uFel 8zVnNhUKBpvwEu4SSHAMi3rLp/PrG1HXh6PlflbO6bKiZ8QkF0ewo5RoWZcW9Q4m7Wx6je uB3MuEpyKgxJwmrh5Unc+oCaTJi7yCwiU5hr6s11a2GKaGtbMbjrmGvT/11xUw== 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 4ZyFvq686MzcFn; Wed, 14 May 2025 14:24:07 +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 54EEO7ad060376; Wed, 14 May 2025 14:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EEO7w7060372; Wed, 14 May 2025 14:24:07 GMT (envelope-from git) Date: Wed, 14 May 2025 14:24:07 GMT Message-Id: <202505141424.54EEO7w7060372@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: aff92a9f3c6c - releng/14.3 - 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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: aff92a9f3c6c4c363188b667ae046d4789a5a63b Auto-Submitted: auto-generated The branch releng/14.3 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=aff92a9f3c6c4c363188b667ae046d4789a5a63b commit aff92a9f3c6c4c363188b667ae046d4789a5a63b Author: Christos Margiolis AuthorDate: 2025-05-13 22:02:41 +0000 Commit: Christos Margiolis CommitDate: 2025-05-14 14:23:53 +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) (cherry picked from commit 3de66f369c1e8db46ae938d446a72f6ff3493356) Approved by: re (cperciva) --- 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