From nobody Thu May 29 22:10:09 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 4b7gXg0Clrz5xYxY; Thu, 29 May 2025 22:10:11 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7gXf395cz3rlr; Thu, 29 May 2025 22:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748556610; 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=1CBdmFd3PFSWGvAPvanZAtPUZyYD3vS2xos8kD5zO08=; b=lW7PKTq4pKwIt0XXGYTmczAT+2q4XU6bpN4f+QE+0JnUdp6Q7+SGsmdyhRvk892hjGMnj7 uozq7UY9MMXhzq0ABi4mAfyhxj4PdzGqJDoMII1ocqu6m9s82vOUnkr1PYv2mfEXFK211/ j2QvibVavK6a+bGW0YI2RgGTyFiMVhKB9KYrGsES5nmuGIk6rObts9X3E/UaKuZS/CpCok nRkSEsAHGrQGHRR7/g9RlYQAp3h3elDBJU3oMBpXYx1bDHmF8+g3LAhs1azriVUlA6STtj iKCCE2ydLSz6N0VNZBO7w+a34Z8xTjYKxRhKauh8zyWGDzqSazLJrOGxHH55iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748556610; a=rsa-sha256; cv=none; b=frv4jJSdHPpFvbKPFyJGLVDhKWasP6nr0I3h0iwdjTWVS5L7Fk9M+ylTI/5qCbsiKgGpCD tGRSxN9OLxWanvgwhSEVmFQitghzYk/nRDsCfbEL82feQhh8/F7KJZU6zYXl8qaewqR2an XQivrpug7kF8rCEc+TIEVnhvqmTISxOyOFFvSEQwV+3UJDTHupbgoFuA8of5b+jRGQxQ+B F3OGT22C6CDedf42actQOvqSxirALJR+pSBd5o1QcyEloh8rHhNm3c4vylUSB5LpD6GxOt x20bjAPYBdszgYeMFLr5OTVqLQVnItX9y7uzPreC/3Qxpjt5gwkUTPj7XhNe3w== 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=1748556610; 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=1CBdmFd3PFSWGvAPvanZAtPUZyYD3vS2xos8kD5zO08=; b=uXC0cQ2c140sg3QT5pZ5qm0/TfPJVtFBeJGZ8C8KL5GknMU0Hk/SVBhMCv7AZ235bC0to6 xTU7A0IzGqwCdx0cXSmhry6iyAMV+bByGr5+ycBQXOIoAZQ0TyRdtpysKeOvLvxyum7Myp K0pVs8hhuZKDuHF27ZwBNXzOHBKrtXxWFChW9nt9kbL93r9DzweIZ6HiTfN6gYrSYOT/va IQ9baFRi6l/s0iTORkytrzVZsPb4XhqFgfYzeMCT2L7YPmd6jbvkDhJthr1u+qtjkcZarZ FMybFDi4ZpzN/NRNMDJM5a6YJFU4GypA1touyfGfw5Sz9zF+HVBlkYiNfTT9mw== 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 4b7gXf0x9jz8kb; Thu, 29 May 2025 22:10:10 +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 54TMA9vL079986; Thu, 29 May 2025 22:10:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TMA9A6079981; Thu, 29 May 2025 22:10:09 GMT (envelope-from git) Date: Thu, 29 May 2025 22:10:09 GMT Message-Id: <202505292210.54TMA9A6079981@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: b760fa5bf0e9 - stable/14 - snd_dummy: Make callout stopping more robust 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: b760fa5bf0e965210f8df05cef9ff46c68377d2a Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b760fa5bf0e965210f8df05cef9ff46c68377d2a commit b760fa5bf0e965210f8df05cef9ff46c68377d2a Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:28 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 22:09:40 +0000 snd_dummy: Make callout stopping more robust If the callout gets rescheduled during detach, we might access freed pcm_channel resources in dummy_chan_io(), which will cause a panic similar to this: panic: ASan: Invalid access, 8-byte read at 0xfffffe00479f65d8, UMAUseAfterFree(fd) cpuid = 1 time = 1747433047 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0xa5/frame 0xfffffe0046a8d730 kdb_backtrace() at kdb_backtrace+0xc6/frame 0xfffffe0046a8d890 vpanic() at vpanic+0x226/frame 0xfffffe0046a8da30 panic() at panic+0xb5/frame 0xfffffe0046a8db00 kasan_code_name() at kasan_code_name/frame 0xfffffe0046a8dbd0 __mtx_lock_flags() at __mtx_lock_flags+0xd3/frame 0xfffffe0046a8dcc0 chn_intr() at chn_intr+0x3d/frame 0xfffffe0046a8dce0 dummy_chan_io() at dummy_chan_io+0x9c/frame 0xfffffe0046a8dd10 softclock_call_cc() at softclock_call_cc+0x2bb/frame 0xfffffe0046a8de80 softclock_thread() at softclock_thread+0x162/frame 0xfffffe0046a8def0 fork_exit() at fork_exit+0xa3/frame 0xfffffe0046a8df30 fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe0046a8df30 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50386 (cherry picked from commit 0432b2183f25ddba7e13a33adf1dd6f9563b0bd1) --- sys/dev/sound/dummy.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 89e22a5ceb44..eeb6bd4ad4ad 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -65,6 +65,7 @@ struct dummy_softc { struct dummy_chan chans[DUMMY_NCHAN]; struct callout callout; struct mtx *lock; + bool stopped; }; static bool @@ -92,6 +93,9 @@ dummy_chan_io(void *arg) struct dummy_chan *ch; int i = 0; + if (sc->stopped) + return; + /* Do not reschedule if no channel is running. */ if (!dummy_active(sc)) return; @@ -108,7 +112,8 @@ dummy_chan_io(void *arg) chn_intr(ch->chan); snd_mtxlock(sc->lock); } - callout_schedule(&sc->callout, 1); + if (!sc->stopped) + callout_schedule(&sc->callout, 1); } static int @@ -195,6 +200,11 @@ dummy_chan_trigger(kobj_t obj, void *data, int go) snd_mtxlock(sc->lock); + if (sc->stopped) { + snd_mtxunlock(sc->lock); + return (0); + } + switch (go) { case PCMTRIG_START: ch->ptr = 0; @@ -345,8 +355,11 @@ dummy_detach(device_t dev) struct dummy_softc *sc = device_get_softc(dev); int err; - err = pcm_unregister(dev); + snd_mtxlock(sc->lock); + sc->stopped = true; + snd_mtxunlock(sc->lock); callout_drain(&sc->callout); + err = pcm_unregister(dev); snd_mtxfree(sc->lock); return (err);