From nobody Thu May 29 10:25:27 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 4b7MvX2C5fz5y3cR; Thu, 29 May 2025 10:25:28 +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 4b7MvW5Zz8z3xQV; Thu, 29 May 2025 10:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514327; 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=EwqiTx0stRpxsPDnfWEohrA1sMG1ZpK5rIFVEM6cysA=; b=SNCqSx2Hyh3WKPxiEzfXa5slzq3Bu/3O94/PUSVBmg9OYuhKwjkS+QiSLVziCczelzrrAx i+SO0r4Y9qswBk6xLRc2SAiXwBHhGdOapKsYxK0TlliOxc8cHCcHjhpkG+BFMMbN4k5MNk zUjU2pAVxGX75Ydy0IUgXs47/JGNBML7Iz69EZFVWCAHmqwtj8A57siwGRFsdjBvPVI/af B1HPU45+ygE4xGMQJAIPG91/ZkZQcUPFVRrmyKO4qpUTx+Ba5um53KXQgortKL/3rzGlwC /LJJlDN/pH+RxSRoiqx7Z/XJAHD8cVZnL+ZpZXPQxHHFVHiJiemoI1sVuNDDAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748514327; a=rsa-sha256; cv=none; b=Z177rmFjaig7tMNSBpoc7g8pnU/aN9QHN5eiziI5wq6L+ggd5Qg4T0MPWagNntCa2LVBDg 3GYmhKhBCl08/1UjcOMTTItMXDIWCQxWq1T87NcjvPXzSm0wNo6N67O7ro6CnVQedHH8BC I7AeHjxqzTPyzPebi/ZO7XHmeyisxA+42pftHekKWhDTSZTanoZshXjXxEG0bsqKPCT3Hl yjQAxEgB5g25k7YlGfGP1xvaWKFM8JO13NQlIRQete2tOTnao8Ex9YUbG70ktnaXicQFHl mBI/3w2cHKHnFBavJ7jjTXfYlrCCnIwv28fjyopv7cQ7GmVrBnfCHOT3Y9DVVQ== 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=1748514327; 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=EwqiTx0stRpxsPDnfWEohrA1sMG1ZpK5rIFVEM6cysA=; b=aN4IqYDKlrmO7MfJayIt/uKBYwT/+iQmRoKAK52fg1+2k6nqtlK3py2qhSJE0VdB2Em7gl dClJuQsAUHko45kwndnp3BnuAODE/MpUWzXWnMlqnSe8hmyFuTCq+0lkrPycJvac5WHrYj Dw3Xa5/Sl/O0PnTpuwe2FEYlMCTbZtPshWiaMBsqrTGqB9QTqqOmm18U2+GA1AFRiooNE+ yzPLOH86jh+6yfYt7mxh6DjP4J3KShTSNK099oyhxrv4ebKUAz5hc6hRgUjAXguyGxofsd I+RDXcNOAcIUFfbox9XQGWIut8MdDiZsOOjpIcRuY2ZP3Y93FJzzbtqTS8y55w== 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 4b7MvW56Ypz1HPm; Thu, 29 May 2025 10:25:27 +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 54TAPRND061101; Thu, 29 May 2025 10:25:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TAPRin061098; Thu, 29 May 2025 10:25:27 GMT (envelope-from git) Date: Thu, 29 May 2025 10:25:27 GMT Message-Id: <202505291025.54TAPRin061098@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: 0432b2183f25 - main - snd_dummy: Make callout stopping more robust 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: 0432b2183f25ddba7e13a33adf1dd6f9563b0bd1 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0432b2183f25ddba7e13a33adf1dd6f9563b0bd1 commit 0432b2183f25ddba7e13a33adf1dd6f9563b0bd1 Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:28 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 10:25:18 +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 --- 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 ae2af6fa61ed..1e2a81f40103 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);