From nobody Tue Feb 25 11:48:11 2025 X-Original-To: dev-commits-src-main@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 4Z2G7w0GNTz5pjlp; Tue, 25 Feb 2025 11:48:12 +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 4Z2G7v3VJyz3k8r; Tue, 25 Feb 2025 11:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740484091; 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=v5w7Cteon3nt8/sS7tP/Yd6BlAdG3wdid6898FEpqGM=; b=FPr/PRRxvFMgKlkI9W5vKuz670ayAK0zca5BMPJ4Njz2pwXuFHkkQuLvsaW3tuWajWJIXt 2V/7pC70G7pEJPg3AeGuk6oGQy3O5VCDLCyU0xPG6uBC1SF50CXx66XQPtEMprTjXNEYeW rfL8w0HvXr3Ac5zz5pGR8QMXKFTVm0/YBLCgS8NDC7/bfaKuQkE2y1kxRlXflENubuLp9M whNc0Q0F1d6CdHqlvhqVKICIfCrv9/DTjprpXIzNWzi1til16ALB4UAjkxUz2fe1TW9nAb z1E/wTzEAHhgKuvg3TrlPTQfuNTumkERzKhhNaFE9L7kuNrWDzHDmUPF8JgBVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740484091; a=rsa-sha256; cv=none; b=ArBElE6BINy4/8IyY0DfGPMV6ExZ6T3+BZw4Hi0cpgKH2U6VgCFNQ2efGZtvy2wP8cjrpP e5pujb/9ktiJUukEXE0Wk1lDzdGsEeTmdS6WNbdvZhFHg7N35glUONQcVa+kId0gTT+B5k jY2BHsMIkKnJBH3CLls/nQ+VXROE2WLSraVDy263u1i2JuJ0ujmAUACms6WqO119T3v40x bS9LkIys/zYkGo0LOE/eUfWuYZPQ9AUdvpwflGc6r7c9/JxOlhzptbRgg4CzKnaR0acGFc K8gJSD8CsGLHjy7TvPVfIKdFTa3LWL8nkArweyevdC8or0qTFzr3eWX3VsLWoA== 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=1740484091; 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=v5w7Cteon3nt8/sS7tP/Yd6BlAdG3wdid6898FEpqGM=; b=RvhrigeCSMS2xIxkUGU5GGLl0b1gBBDRO7muz4CTk9EcLJiE/2SUVGQuh8DsdlVk2ndUvG Y/Cir7XemKDFazTPZ9/LpURK8+MmcD5rA2acjpOkkohUtwCYw3k7Sg0yPqSP/x2UopsGwG vl0CDGCfu2JatHytrCOkOfH62vWb69XQoFz3UoKIzCsI69b3B+zF61QYz6VsKs3qB8BLU+ 8S7UHP039/BiwOW4ZeWV1JsSaB+Nsc+ksu+p9h7R8aTYx0WGMQXUSceq1DIudaWDogVgSz xobnxenTKjhjJeKNclvfTZAh4yESZHvSEAepqqWpcOc2SPsAAd+e9fwU56N6cQ== 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 4Z2G7v34pcz94J; Tue, 25 Feb 2025 11:48:11 +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 51PBmBK7050798; Tue, 25 Feb 2025 11:48:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51PBmB6K050795; Tue, 25 Feb 2025 11:48:11 GMT (envelope-from git) Date: Tue, 25 Feb 2025 11:48:11 GMT Message-Id: <202502251148.51PBmB6K050795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2546ab1b3632 - main - sound: Call vchan_destroy() on vchan_create() failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2546ab1b3632a9ebfe88d9d5dc55700e653bff5d Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2546ab1b3632a9ebfe88d9d5dc55700e653bff5d commit 2546ab1b3632a9ebfe88d9d5dc55700e653bff5d Author: Christos Margiolis AuthorDate: 2025-02-25 11:43:19 +0000 Commit: Christos Margiolis CommitDate: 2025-02-25 11:43:19 +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 --- 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); }