From nobody Mon Apr 29 10:43:43 2024 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 4VSg0v72T4z5J3P0; Mon, 29 Apr 2024 10:43:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSg0v63Dsz4pdR; Mon, 29 Apr 2024 10:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714387423; 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=NDhDE5VqB5MJXR5J7bR2W0BBAiuXf3Cerwlee2NFOak=; b=ELEzi74RhOKJV1IOQ2M0CtsqJEnYBVdcb7VRSn2RFoJ4izcloaPWf9yaViEZhZmlH6mCfv hg0QCmXByCHFQnBbLZAEUrJAZbHFlo2s0eUBbhGR8AswbQbjIOO+woIES/8viPhck07Vet PkEfdeTSz3Axa6XJRRjmagzGjXiwekW4c6jCXQhxU5yOFXTGsZQ8qM0GJv2noT8NlIbP9D UTpB8H4icnfnYMJVqu7zef6Ug7lswmd9pnrZt/PVKgrTyG3Ap+oUa2MABfxQ4s6nF5Zzgv xzSkdXJ+YP0XJGU0veEa17m8avsES6KVw4x5vufsi2rjQVjBnoPjas2246/2iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714387423; a=rsa-sha256; cv=none; b=BvraLVHM9+Vk4q9MEmesVAE9O4kr6OC8Fnvah7IslqVAtlU1PeJU7/Qe2zXvc7pzDTCMR2 VjmMZzBdB2IC3G1cLXLFNSP64nMj8PqNYlt8Thhl9MlmaZwVYFG/IHAaLNAK/tBtwdHjh9 W6HCtwbetdl97WIicIy1PvB0gpBKzr4RGiFBMt1NyKYOpkhwSqjeIdWlnDqPubym423xv7 1BQHXHcH5G+3jDkfIhg50LwT+hDRyF7sTRLf7XHuYA72tDKEixxwdQYJDojcQIh1fruJtd uz7aagsLP52PuQNf7fa7vtGAp70w04M0Hf6domHeOIkVXIoPBSSAgpfaGA5kug== 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=1714387423; 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=NDhDE5VqB5MJXR5J7bR2W0BBAiuXf3Cerwlee2NFOak=; b=j6UhmIGtsyJQajyG/mCCesjZX0cyOoQAbxgdC+YaH2WAuU7NfsY3iEjt6Eczd5qiu+zkzC Dp7HcBLTonbfOgI2FwUB4pxYGvMtEQgvNgqmnQEBDy2EYjLkM1Jxz5nfREM4qilM9J+USu kYBuyvPk7CeZsqnzSm/lRi3hm2m/MNHQ6p1an6TYl0Ig4RMFHtxblSTqXTtpNyyzwkgrRp ZpvQ06v7jJVwq7GpKlFdmYPYtlWKA7+r5QsTxEUMJunKWufbApJyWyig1fOsdur2MkFlxJ Nxq/MP1eXwqvtMTSQ1nMp9mTVdQLT2uq3q00wVjhPfcMvuPnf1JdyiVAukVKcQ== 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 4VSg0v5cZmz15NB; Mon, 29 Apr 2024 10:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TAhhmZ088334; Mon, 29 Apr 2024 10:43:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TAhhqn088331; Mon, 29 Apr 2024 10:43:43 GMT (envelope-from git) Date: Mon, 29 Apr 2024 10:43:43 GMT Message-Id: <202404291043.43TAhhqn088331@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: cc72812c49ba - stable/14 - sound: Fix NULL dereference in dsp_clone() and mixer_clone() 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: cc72812c49babc4b3a9bf904c91851e4921785fc Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cc72812c49babc4b3a9bf904c91851e4921785fc commit cc72812c49babc4b3a9bf904c91851e4921785fc Author: Christos Margiolis AuthorDate: 2024-04-28 19:40:14 +0000 Commit: Christos Margiolis CommitDate: 2024-04-29 10:43:30 +0000 sound: Fix NULL dereference in dsp_clone() and mixer_clone() If we only have a single soundcard attached and we detach it right before entering [dsp|mixer]_clone(), there is a chance pcm_unregister() will have returned already, meaning it will have set snd_unit to -1, and thus devclass_get_softc() will return NULL here. While here, 1) move the calls to dsp_destroy_dev() and mixer_uninit() below the point where we unset SD_F_REGISTERED, and 2) follow what mixer_clone() does and make sure we don't use a NULL d->dsp_dev in dsp_clone(). Reported by: KASAN Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44924 (cherry picked from commit 074d6fbebc160222cde6b726adcc7350881d7824) --- sys/dev/sound/pcm/dsp.c | 14 ++++++++++---- sys/dev/sound/pcm/mixer.c | 3 ++- sys/dev/sound/pcm/sound.c | 7 +++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f685d7e38f6d..20625641a601 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2086,10 +2086,16 @@ dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, return; found: d = devclass_get_softc(pcm_devclass, snd_unit); - if (!PCM_REGISTERED(d)) - return; - *dev = d->dsp_dev; - dev_ref(*dev); + /* + * If we only have a single soundcard attached and we detach it right + * before entering dsp_clone(), there is a chance pcm_unregister() will + * have returned already, meaning it will have set snd_unit to -1, and + * thus devclass_get_softc() will return NULL here. + */ + if (d != NULL && PCM_REGISTERED(d) && d->dsp_dev != NULL) { + *dev = d->dsp_dev; + dev_ref(*dev); + } } static void diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index cc8cf5b1ceea..b84dfeba7043 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1376,7 +1376,8 @@ mixer_clone(void *arg, return; if (strcmp(name, "mixer") == 0) { d = devclass_get_softc(pcm_devclass, snd_unit); - if (PCM_REGISTERED(d) && d->mixer_dev != NULL) { + /* See related comment in dsp_clone(). */ + if (d != NULL && PCM_REGISTERED(d) && d->mixer_dev != NULL) { *dev = d->mixer_dev; dev_ref(*dev); } diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 52ead91853e9..7de099cfe5ca 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -1018,10 +1018,6 @@ pcm_unregister(device_t dev) CHN_UNLOCK(ch); } - dsp_destroy_dev(dev); - - (void)mixer_uninit(dev); - /* remove /dev/sndstat entry first */ sndstat_unregister(dev); @@ -1039,6 +1035,9 @@ pcm_unregister(device_t dev) d->rec_sysctl_tree = NULL; } + dsp_destroy_dev(dev); + (void)mixer_uninit(dev); + while (!CHN_EMPTY(d, channels.pcm)) pcm_killchan(dev);