From nobody Tue Jul 14 21:17:08 2026 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 4h0Bvm4N7cz6lKHP for ; Tue, 14 Jul 2026 21:17:08 +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 4h0Bvm3TL7z45cs for ; Tue, 14 Jul 2026 21:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784063828; 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=Ui8kCeQJHSxipkIzkpZ/7wymcgH1PBQS71LGbCZAxrU=; b=Gh9j9geMe2uXl8Nr/cOAnDGR4XkRmn/V27l7/YIQPAkFy6z/SN4UN9akKgOEpFI/9wzWNQ HwZhuvrqfFPhYw5p7OxtFEQJwvjb4pg6riTX5giztrDqsQ9ltYjWBtcmt+k6SOsibUrzcI rBH7My/g7m9+piSzNvEQpkr1/Rp5WYGmCRKGgr/MD7k+E/X0W6qmezfASBSiUH3IPskP4v tyN2UhaIcAlTqonIHqGMRXuGn2S1qMPIchn3KWrriV8unN1TNB/yIuT/5SC+J9xCkrFkJD CeT+hZbRQ3DzKiFTucRhSEYU32T06AZqFIGbPb8+xGQ0y5AaeE+9Vp7N0lzP0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784063828; a=rsa-sha256; cv=none; b=tP5nq5gRFWMgDRFVvERX03mWN0J4AnSzWCKLaE5h+I7tE+/rldBzntAjeG5R50rP5lkbEB pzQNvnYao9ATbXTdrMDDGbIbbZZAs7kfx20iJy2fTQCIELtcrCi4pXqe2QGqqxqsJbsCnM +WVF9EjiBlq6lRID5SwVCCxEQnBx1ZONJPQqXqpA9xBU2M4yVbxskVRQQsM8yvqZhWh9JX pw8QJUMdKYWQd4WKRR/VyTdKiK91OG6FuRkuG0WQ+Q3YBL/XQltWxKr3hm/P/hNDQ7upo0 b0A5x15UI4Z3s93oL6/hj5bUrgXsr5wcoQskXm8rDpJp5HJpX78Mh9bznM+u2g== 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=1784063828; 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=Ui8kCeQJHSxipkIzkpZ/7wymcgH1PBQS71LGbCZAxrU=; b=A4n3+1Z2mpavJ2YhX3cOrFSJbtzxl9Lkk0WEa5RiFVVHg9mNyjZzxEvVpK9ku79OeUJNId lW3w4YPQd56ayjit/M+eRKrnOl+v8zesQtHf7OKM+P6246dZtbSfWhqUvRXv9Sv8Xd7uZm qyrqpLM6I66cSKXou6FPJ3P6K8Sp7MWwGtlmNiF4EGJyCnSAHRXSy7ll8xPjvSonXLmh7J EsRLHjYssvUBV6kstzZklSbF0Ncc+ZIZX7wc2MoE8k4iuRD8K50faquP5KseT2RyN3jEd2 B8M9pu16+2kw7v9F88mrIPtMQYNBsJxn63vHSjFrvPCNJFEqjx+VwYOFDMKadQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h0Bvm2L0Zz128Z for ; Tue, 14 Jul 2026 21:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d4ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Jul 2026 21:17:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 954001a9dd36 - main - snd_uaudio: Initialize mixer_lock with MTX_RECURSE 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 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/main X-Git-Reftype: branch X-Git-Commit: 954001a9dd363da9184706657eb34f9622bb220f Auto-Submitted: auto-generated Date: Tue, 14 Jul 2026 21:17:08 +0000 Message-Id: <6a56a754.3d4ca.1ac6671c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=954001a9dd363da9184706657eb34f9622bb220f commit 954001a9dd363da9184706657eb34f9622bb220f Author: Christos Margiolis AuthorDate: 2026-07-11 12:57:35 +0000 Commit: Christos Margiolis CommitDate: 2026-07-14 21:16:28 +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 --- 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 4072c8138cea..4cdd20315258 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 &&