From nobody Tue Jul 21 22:28:19 2026 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 4h4X8n2kL0z6mXxG for ; Tue, 21 Jul 2026 22:28:25 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h4X8n0ZvWz3qHF for ; Tue, 21 Jul 2026 22:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784672905; 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=bxwY1Ac9drAdvbUoFGDvBjUKyqvQS7EByb0BXqsBeQY=; b=IA0XpeSDDUS36hEwGAcTtZCkdC9lwF0kRs9DMBP2fEYIXV7cmQy2JI9RiMegsC9ZDB2+ff /LDCRg2L1j3il1egyb8HvxKAuOPaLTF5pDKTX0e+k7d2g+4PS4r0WuP6VVwssHGy6bhb8E U3XC8FyimJuM6no54GglCV5nBRjcvXQL84E9pcSe48fvXEiB2m8xyKjy1VqKCNvavcfKtZ RuDen8A2lni9UhEPGLJLmXfscump2GPsVqytg9D7sRFdNaAEjeS90bG0bqTe+w4otPWf8A /PDueqwjC9vb31Djcjrw5Ei3H7+sZnhVE2Ez1Lnyyg+gtYNQYGMenE0NAWIDUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784672905; a=rsa-sha256; cv=none; b=FOq/1K6wZpkAgMbNQJsrUmDs0+rWkdPJhnYOz26YaalDSFAcyD3k48hVEh/ISNoltScDqh mDrwEUNk4TKezK5Y7ABrW/dSuT+rqcuZGo91SUOMH5UKlRd1w+QfsmuEG5lKCSWdnmWU/+ IpxmP6tSB5NNbPYTACIxaMNK7eHbcGlfEJnx3H2pBu7CQjRuHsFcIk6sjJsh0qT4zHUgS3 hd7JCC7zkhjr54DtjF3bmeSKHZ4P0DQ3IbHNGY0qKT83mQE41KN5bL8dKjg8b+aVd2nKMb +f6WUEHIpX50ZKQs4w4bKzMzLlu9l+zSsyfFWxvG5jsyNmJiq0+t9UdKPqlbuQ== 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=1784672905; 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=bxwY1Ac9drAdvbUoFGDvBjUKyqvQS7EByb0BXqsBeQY=; b=AP67YGnbc+3EX8rYvO/SbOAvWyOe/ambdl+Yc8ywy7Fyuma8mzEzKnBP+C9oMVDTRlGt5u Dv7rZeoneRqEvn5mKM2hlnzDrf5KPYeU2l6voDbXHM/g5vSQw63SSSC9qNSqSsPihqJTD+ mFQXyKhWwz3UCL4vW2Nk9bJwa33oxWDc+mRbR3EJajw26a2B8HXAVWigM5vNBaYILjxoWQ pLkZASiWylRh6kov8jVHIInDtevCst6aWLIxZBVZac1JkDcnBFVFW6HGkeCxUkGzglfW0f q06Q6sYBqwmbgqKobKZSm+mEHa/3OokUyEVt79F6jF1ZNPSC7i08kUxN2RqZag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4X8m66Njz173r for ; Tue, 21 Jul 2026 22:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39485 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 22:28:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c715fbb8b7e4 - stable/15 - snd_uaudio: Initialize mixer_lock with MTX_RECURSE 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 List-Id: 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: c715fbb8b7e4926b93d7949b4d51ab07334d0b84 Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 22:28:19 +0000 Message-Id: <6a5ff283.39485.152c7f6a@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c715fbb8b7e4926b93d7949b4d51ab07334d0b84 commit c715fbb8b7e4926b93d7949b4d51ab07334d0b84 Author: Christos Margiolis AuthorDate: 2026-07-11 12:57:35 +0000 Commit: Christos Margiolis CommitDate: 2026-07-21 22:28:12 +0000 snd_uaudio: Initialize mixer_lock with MTX_RECURSE Fixes: fc9dc8482396 ("snd_uaudio: Lock usbd_transfer_start() in uaudio_mixer_ctl_set()") PR: 296682 Sponsored by: The FreeBSD Foundation MFC after: 3 days (cherry picked from commit 954001a9dd363da9184706657eb34f9622bb220f) --- sys/dev/sound/usb/uaudio.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index eedd52774b70..2425666f224d 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -5435,7 +5435,14 @@ uaudio_mixer_init_sub(struct uaudio_softc *sc, struct snd_mixer *m) DPRINTF("child=%u\n", i); - mtx_init(&sc->sc_child[i].mixer_lock, "uaudio mixer lock", NULL, MTX_DEF); + /* + * Initialize the mutex with MTX_RECURSE so that functions like + * uaudio_mixer_ctl_set() do not panic when they recurse on the lock, + * as a result of a callback function (e.g., uaudio_hid_rx_callback()) + * also having acquired it. + */ + mtx_init(&sc->sc_child[i].mixer_lock, "uaudio mixer lock", NULL, + MTX_RECURSE); sc->sc_child[i].mixer_dev = m; if (i == 0 &&