From nobody Tue Nov 03 09:10:51 2026 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 4jJjV33BzFz6yQwj for ; Tue, 03 Nov 2026 09:10:51 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjV30vXYz4Vc8 for ; Tue, 03 Nov 2026 09:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793697051; 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=vWoInP+3Jp9JiNsd8SMd0bf6LcNQSe11kySkywAJZVg=; b=Csgu/lNGQUnXwSXq6pPnCl6adh3kt7uuTg0Yc6IyAYiLiz85bybhIWgahsyo95IQ7Hgc72 LiljhEQV8S5WTyJy3UxrlGPyPsY8jrJMfUgXL9v/I8COjGucoPK4m4ietx+22lyt7vw2fe YvGAhKV/Y8QmdJDwQpjdmg4AtlO96mswtaWs3W1pi9pHA8matpI+wG+L6vYN/VQvkrW1PM X7N0ddDYeFuhaHeQxHG62u54Xf3lrlRG4rmI4eIutYRf4a7ZjNuaxjcM5+jgGB7TubmecO 6+kyARQhDYNNqJal4w/krCE0oVWlkl/GhIRo+taeVcDHGeDTe+5PHvJFPi21kw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793697051; b=udb35Yjs+kJGCs9GuAcsANzjO/C9mvDtn9q6hTQxpdcZmFzN2LfoNk45eU/b1x3j+tAmLx f+Sh9SMpQRaIbV6+EPddk6naql4wqWq/bfdz3VQnK07i6kFp7sq9BtnxfZ8lJToI3m5X+j 4QPaZhqntDOl57+nUYfnWrJo5HXpmYTzcn1dYGowQsi/vt/6NjnmEDKn2p2csNCbw3SBXF JrdLmhqzLXJNRMGTOk5OTZQBPqp1caYmG7eAaC1aqUz+TkeyV/e0jiyO8WNdCNIRJLni+z WRJc9rfBu+kQ9gPpIpj+iI5DYUc/eJEvKJ1o6w36SJ0UFeTaYzxvYb8IPDyMnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793697051; 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=vWoInP+3Jp9JiNsd8SMd0bf6LcNQSe11kySkywAJZVg=; b=uqP8V0mng94Ig2iVIpo6P44mcnFBz3kcGKmb8Gk3yblukYPDRpy+VndPaABUrbBWdfm5ty KJH7nggLT8alD3C29WdWpWnO1jIooDZeNEG4EaMRYUdbpycKlwgzFhgDLPMpy35i4BwqLY bjT9SNMIAJ4oL478W0Aw6xBGjsikPViGFcmd4N5wBZXhAd7AEM8TtGg2ft3y8oC9IKTjPT NylRX0SbAfMojv6MhAXPQsMHK6FhJlbqgXnMPphJWL/11EWG4M9i2VXMcxg2M4PX/TxkCR nQw5n8C+6r4dnNj3D8XeOBri52dybe8ZlbsIfzTdSNlvHbu8D00V2xCQg8cCVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jJjV30GfVz1PZ7 for ; Tue, 03 Nov 2026 09:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45aa7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:10:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1f94158da648 - stable/15 - sound: Let pcm_unregister() tear down a partially initialized device List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 1f94158da648daa262de7cf1e1dc791e0c600e0f Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:10:51 +0000 Message-Id: <6ae9a51b.45aa7.42d788c3@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1f94158da648daa262de7cf1e1dc791e0c600e0f commit 1f94158da648daa262de7cf1e1dc791e0c600e0f Author: Christos Margiolis AuthorDate: 2026-10-27 11:26:29 +0000 Commit: Christos Margiolis CommitDate: 2026-11-03 09:10:44 +0000 sound: Let pcm_unregister() tear down a partially initialized device Since 3107b952f534 ("sound: Merge PCM_ALIVE() with PCM_REGISTERED()"), pcm_unregister() is gated on PCM_REGISTERED(), so it cannot run unless pcm_register() has already succeeded, which means drivers will leak resources if a failure happened prior to this. Reintroduce PCM_ALIVE(), but test dev rather than the lock. pcm_init() assigns dev before anything else, so it can tell us whether pcm_init() has run or not. Make sure to clear it in pcm_unregister() so that a second call to pcm_unregister() cannot double-free. While here, publish to sndstat(4) only once pcm_register() has succeeded. Reported by: jah Fixes: 3107b952f534 ("sound: Merge PCM_ALIVE() with PCM_REGISTERED()") MFC after: 1 week Sponsored by: The FreeBSD Foundation Reviewed by: jah, markj Differential Revision: https://reviews.freebsd.org/D60801 (cherry picked from commit 5760c22a05220cfb6b6cbf623f2cda5047b28706) --- sys/dev/sound/pcm/dsp.c | 9 ++++++++- sys/dev/sound/pcm/sound.c | 10 ++++++---- sys/dev/sound/pcm/sound.h | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index c03926560715..520d742765ce 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -160,7 +160,14 @@ dsp_destroy_dev(device_t dev) struct snddev_info *d; d = device_get_softc(dev); - destroy_dev(d->dsp_dev); + /* + * The cdev may not exist if the driver failed before or during + * pcm_register(). + */ + if (d->dsp_dev != NULL) { + destroy_dev(d->dsp_dev); + d->dsp_dev = NULL; + } } static int diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index aa4f1d97e243..6d3cf3628d3f 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -428,8 +428,6 @@ pcm_register(device_t dev, char *str) vchan_initsys(dev); feeder_eq_initsys(dev); - sndstat_register(dev, SNDST_TYPE_PCM, d->status); - err = dsp_make_dev(dev); if (err) return (err); @@ -441,6 +439,9 @@ pcm_register(device_t dev, char *str) } } + /* Publish only once registration really has finished properly. */ + sndstat_register(dev, SNDST_TYPE_PCM, d->status); + bus_topo_lock(); if (snd_unit_auto < 0) snd_unit_auto = (snd_unit < 0) ? 1 : 0; @@ -463,8 +464,8 @@ pcm_unregister(device_t dev) d = device_get_softc(dev); - if (!PCM_REGISTERED(d)) { - device_printf(dev, "unregister: device not configured\n"); + if (!PCM_ALIVE(d)) { + device_printf(dev, "unregister: device not initialized\n"); return (0); } @@ -496,6 +497,7 @@ pcm_unregister(device_t dev) cv_destroy(&d->cv); mtx_destroy(&d->lock); + d->dev = NULL; bus_topo_lock(); if (snd_unit == device_get_unit(dev)) { diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index a8d68777ab48..cd2d1bd0214d 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -125,8 +125,8 @@ struct snd_mixer; "\015PVCHANS" \ "\016RVCHANS" -#define PCM_REGISTERED(x) \ - ((x) != NULL && ((x)->flags & SD_F_REGISTERED)) +#define PCM_ALIVE(x) ((x) != NULL && (x)->dev != NULL) +#define PCM_REGISTERED(x) (PCM_ALIVE(x) && ((x)->flags & SD_F_REGISTERED)) #define PCM_MAXCHANS 10000 #define PCM_CHANCOUNT(d) \