From nobody Tue Mar 04 15:47:09 2025 X-Original-To: dev-commits-src-branches@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 4Z6g6P3KRCz5qGdq; Tue, 04 Mar 2025 15:47:09 +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 4Z6g6P1G4Vz42d7; Tue, 04 Mar 2025 15:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741103229; 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=XRc33ompDDMEkqZRDzeQ6Wn8/t4qNUI5kzib74H0dUI=; b=GCP9b1Ic2ib1JEPcFBnTMhCU/cd6t7iVyaqlPJdkRQACredeHD2U6eO975rorZjoFs2I2Y saG2z+rZxGGmKQrveDbqdaomvh2/rJ0e/Hgagvz9KQrL0gsuOsttgveiny2875ayTOdwME kEJppErTpE/pAMUyUmmnajRgDFkztjVkDN52ae9j624ftUU1273dpKSOhdSWSZxzjsElfV 7ub9T61TpTxjjI5jZziJIHOWwus43Eu1NlhIDBqLpwJ1sOPPUxLk7FvgS5d6s7ERuApza3 jgPrVXhyEQYoxAbrlJdCtD7TWCMxxU6LBv/T+VdL/lrvEY+auoxGoV69iFgrdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741103229; a=rsa-sha256; cv=none; b=wm80+s6Zq7ktQUjCWeurmh5nUywDfB8NY5Q9h4hujSdb6fIrNpheStzNkkxXQbYA2BUiTS SNjS5vp9KIln58LdeZ5nZT1nHDDAM3aSPmoc8zepKLq92XeXtJnyy6mx9dSR6KAt/HX83W KJyWYX3JZK9KFgy+Ky+zRuMaskdqw2pKmHE+BLvsXi08ZQSaYaD8DL/1/GTrpSWJkpjckR VEKFp6Lk4OUdQZzJ2CoH28Bo168A06cLLDNov1ir5zTGOASpm99jwQoq9EUI70lmGgRvEg nhLmvwkzu2p2GrcvuOy+NKQpMfv0I6MOFGubofAE86hz5qr/GXAf/fWHI+TLQw== 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=1741103229; 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=XRc33ompDDMEkqZRDzeQ6Wn8/t4qNUI5kzib74H0dUI=; b=hiK6+2cM5cpC7ICskYFeIgrwXw9dvWklUm9to802UvZ5HmKW5fqLR5Un1DuBBQ07HDE+4Y E+bVB0X4Parc0mDKQMk9rwttTKl0h7hLi0EJEeJEPOxzoPs5/EX6jBiZB5UFNkjDzVIcb9 +TNCpH6PiyxYyYItq4vnjqA1H3XzDZxZC8Hxnw/9/ac+vnc2HIPKstQwzLm36zUlFXIxpX GiyFlmBsFrB/UnniOjb3dk1q+BbXJv907j3fPUPQwg7RiarpAvH7D9v6xcKK/SFyEGsits K0WOapH63ElX3dwqHjfcmWo6dRoUgOmGqEZNpmU+EfTSTSRHjPlm0cAxZ5/8oA== 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 4Z6g6P0bvXz8XK; Tue, 04 Mar 2025 15:47:09 +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 524Fl94g050201; Tue, 4 Mar 2025 15:47:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524Fl9mR050198; Tue, 4 Mar 2025 15:47:09 GMT (envelope-from git) Date: Tue, 4 Mar 2025 15:47:09 GMT Message-Id: <202503041547.524Fl9mR050198@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: 858504a1d89f - stable/14 - sound: Call chn_kill() in chn_init() failure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 858504a1d89f3e1cb89f6126b3b59e80716fb3df Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=858504a1d89f3e1cb89f6126b3b59e80716fb3df commit 858504a1d89f3e1cb89f6126b3b59e80716fb3df Author: Christos Margiolis AuthorDate: 2025-02-25 11:44:37 +0000 Commit: Christos Margiolis CommitDate: 2025-03-04 15:46:06 +0000 sound: Call chn_kill() in chn_init() failure Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48966 (cherry picked from commit bc7e65e950154572d8c9a04dc033075bf37aae40) --- sys/dev/sound/pcm/channel.c | 50 ++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index c3ee50d51c4b..0a0059411399 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1179,11 +1179,19 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, switch (dir) { case PCMDIR_PLAY: + d->playcount++; + /* FALLTHROUGH */ case PCMDIR_PLAY_VIRTUAL: + if (dir == PCMDIR_PLAY_VIRTUAL) + d->pvchancount++; direction = PCMDIR_PLAY; break; case PCMDIR_REC: + d->reccount++; + /* FALLTHROUGH */ case PCMDIR_REC_VIRTUAL: + if (dir == PCMDIR_REC_VIRTUAL) + d->rvchancount++; direction = PCMDIR_REC; break; default: @@ -1292,40 +1300,10 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, if ((c->flags & CHN_F_VIRTUAL) == 0) CHN_INSERT_SORT_ASCEND(d, c, channels.pcm.primary); - switch (c->type) { - case PCMDIR_PLAY: - d->playcount++; - break; - case PCMDIR_PLAY_VIRTUAL: - d->pvchancount++; - break; - case PCMDIR_REC: - d->reccount++; - break; - case PCMDIR_REC_VIRTUAL: - d->rvchancount++; - break; - default: - __assert_unreachable(); - } - return (c); fail: - free_unr(chn_getunr(d, c->type), c->unit); - feeder_remove(c); - if (c->devinfo && CHANNEL_FREE(c->methods, c->devinfo)) - sndbuf_free(b); - if (bs) - sndbuf_destroy(bs); - if (b) - sndbuf_destroy(b); - CHN_LOCK(c); - chn_lockdestroy(c); - - kobj_delete(c->methods, M_DEVBUF); - free(c, M_DEVBUF); - + chn_kill(c); PCM_LOCK(d); return (NULL); @@ -1368,12 +1346,14 @@ chn_kill(struct pcm_channel *c) chn_trigger(c, PCMTRIG_ABORT); CHN_UNLOCK(c); } - free_unr(chn_getunr(c->parentsnddev, c->type), c->unit); + free_unr(chn_getunr(d, c->type), c->unit); feeder_remove(c); - if (CHANNEL_FREE(c->methods, c->devinfo)) + if (c->devinfo && CHANNEL_FREE(c->methods, c->devinfo)) sndbuf_free(b); - sndbuf_destroy(bs); - sndbuf_destroy(b); + if (bs) + sndbuf_destroy(bs); + if (b) + sndbuf_destroy(b); CHN_LOCK(c); c->flags |= CHN_F_DEAD; chn_lockdestroy(c);