From nobody Tue Mar 4 15:46:55 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 4Z6g680wSCz5qGYC; Tue, 04 Mar 2025 15:46:56 +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 4Z6g675RXJz4223; Tue, 04 Mar 2025 15:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741103215; 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=L7frXsOnyFa0yAH4EyobVwtbAIxn8LDe7ZZzn8LTjAE=; b=BOQ1Hq3AGvw+NhKfnQ6XSHwvbGSv8eETxmfYIHvDrIhI0zyG0z5ORHLn1mTAV+YvkLuYB0 6TUFrAwMly/WUSBiXqQ62XR0URUpND6dR9FtwMnepAcgeh4UTDhtDu9XHf1Pn82Q2/igv+ N5tut4CQawkOXyEXTPy0XPqYP8pyfR/ZFXg5GYwdCnxNZphM29K+ICKqD6RrwFd2nPF25K YGtxyg0nngxBzD782Ty+8um7+AJW2+GbCQeVdgkaoHFpbUeI2hFY0ioBHlWRKaosyYBR6C GuANyDgBuyhz4feyDhtR7xPXCICnXvsn5SGroY2WdzNAi+Qn60eYJNfYMQvxUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741103215; a=rsa-sha256; cv=none; b=tBMvfDRjojnAntiZzYF5NPS6x6onCZlfDb5noVVN0kIrgja1RVumG6mof5oFMqXaMVAmlp mngBvXQ9qST12Pi8zV4EskWI4VeH/nbmt1eUJmBwzH2LaT/XGBcXKUckH2ALRfoml8jV+D epgEeLmY4de9anBDbvI8Zqj8zhjurtdJMHTzUYOADEb5t4HoYzreq3OEAH9tkMJAEg8aw1 KnqWNRRcJ2qK9Hcsvs4L8xPW5yWeutt5GIDBru5+2coioeRUcpSqkb2tzWTYUF+TGKzsbT NuT+Vhg8HQfsY4kNupzdCKf0Z5jmaKh49gcrmVhH7ve11i7z2wPijBogqlfc0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741103215; 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=L7frXsOnyFa0yAH4EyobVwtbAIxn8LDe7ZZzn8LTjAE=; b=kMfsbksl+2xHJmS0GoYvHgZ3Lfok3Of1ysnYwKlO04cXyCyAZr4O6n6vsE59nIjhSeNCqJ wE9tXKx1jw977G2j7x6nTJfUtwnu/2hr/FclV9Xi8g+015foC3lXs30P7/kmYHLNNeJrdV PjFfbnedD/VZn691U6xjTH82TAl+9J7VVEaIJdzSrJfz7YBqn4xZdcow/V1wmzIE+kiT/i m/mfTuNIJVvBeoWsehKliED/DQ/Fs2xBquU/cignh9pToy2qIIBBIc2aTZI5rh/dclYexF VB2Vq5Z/hEl+m9M//Yo9h5ZSOL3jmXjNDFFM6lmHyOQKRMGe6s+vTVD9NbuuSw== 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 4Z6g674zCBz8Bj; Tue, 04 Mar 2025 15:46:55 +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 524FktDI049770; Tue, 4 Mar 2025 15:46:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524FktwE049767; Tue, 4 Mar 2025 15:46:55 GMT (envelope-from git) Date: Tue, 4 Mar 2025 15:46:55 GMT Message-Id: <202503041546.524FktwE049767@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: 5fc710ae2d78 - stable/14 - sound: Call vchan_destroy() on vchan_create() failure 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: 5fc710ae2d78d0f8625513b04d131011bde1f7c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5fc710ae2d78d0f8625513b04d131011bde1f7c8 commit 5fc710ae2d78d0f8625513b04d131011bde1f7c8 Author: Christos Margiolis AuthorDate: 2025-02-25 11:43:19 +0000 Commit: Christos Margiolis CommitDate: 2025-03-04 15:46:05 +0000 sound: Call vchan_destroy() on vchan_create() failure Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D48183 (cherry picked from commit 2546ab1b3632a9ebfe88d9d5dc55700e653bff5d) --- sys/dev/sound/pcm/vchan.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index ea8a50b316fe..4ee7e01066d3 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -811,11 +811,8 @@ vchan_create(struct pcm_channel *parent) return (ret); fail: - CHN_REMOVE(parent, ch, children); - parent->flags &= ~CHN_F_HAS_VCHAN; - CHN_UNLOCK(parent); - chn_kill(ch); - CHN_LOCK(parent); + CHN_LOCK(ch); + vchan_destroy(ch); return (ret); }