From nobody Tue Jul 21 22:28:19 2026 X-Original-To: dev-commits-src-branches@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 4h4X8h0gYfz6mY7m for ; Tue, 21 Jul 2026 22:28:20 +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 4h4X8h095jz3qJp for ; Tue, 21 Jul 2026 22:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784672900; 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=Adp2w3lpSdYv7vNRbQJvQH6ppjykXHKhs9t5rWnqLYbtZeBGpRTaytrpZvv6O9qsQQCR/Q YbyyYDn5EWSYFAK7MWw56jCHHAOeEfI4NV3PM4AZofQtYMhiJ7ttUZjWWut9iy3eGubgeW vMVNqm4WFZ+quTOi0eyFiQYjMJagE++A4Fe17yuWkqhmnnB/Lkfgi6dhpxcU2JDW1azJjh sqnP47LmXR+/LdSrB00WJ7UvWTnrqzO12pRrXadxIRqgNpQiJeKxPScKUI2tZjjusNMhDL lsd5XB5wBNc4XQGahTeGf/Myls7yEu5Yp9Kb6LithJzQoNwHzVWAmEh7D+3e9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784672900; a=rsa-sha256; cv=none; b=UbUaBDFp+tlQq9sGeCkVYESk75T3rC6DdutWpSgD3OXRFyJFk9Sznn0cd8KCk0sVvUj78+ mk7THBFpeU4vl4u0ieppYVaAemC33zGQo5ayXolDDBJw5f3TR+Y0cmODVU68G805HToZ0g hyx02/eQtyFWBw+HtIS/H1B9yXpBrTmtmxpysQlqvsnOYC7V5Q19nu4/TCM3xxL7O3fxiW eqzn9qmNJNE6VDyToOWHwYkwWDCw+43NCGD9gkJlaBQGimnFjbugmsnPqsiC/XECZcIbVt K/wh/yD3QvKUh6A4K+COlZjUXvSnPhC1EsKEKvC91/Xco9vE3ojE23lWG7/OqA== 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=1784672900; 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=gIOpztcKIhXnQTdt5xD4pyURZJPHQnxOZ4t/YJHY411sTlbhBydCkbiiQQHsmKL7LTjS3L LlCfwcTV24gY/lS0TZ5YliecJIpeGcUnZd4+j150VbpXTk43R/BcCYtlk4EAivtfY2x0lK x3v2pj2pvb1iPzWDVSEL2v7ZlXiFlyx47cWfx9gLyx9MpUDzKrTm04vAuqmx5RB58gOvui X5D8KuK4gWlKp/sVjUEwmbNelbyKlFO/hbzhwKbCa3lB6e9iAlEvcUOZb0tQcFIe/DR8LV b86ZgvgtABn4tO7fqfpinatGeZi7OfbjIvHvfoJF0cBcJ7zNDZE590Q/Vza9jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4X8g5tvmz16Xb for ; Tue, 21 Jul 2026 22:28:19 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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 &&