From nobody Wed Nov 18 10:24:37 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 4jTyQG6vDkz71J61 for ; Wed, 18 Nov 2026 10:24:38 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTyQG0zl4z4fk6 for ; Wed, 18 Nov 2026 10:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794997478; 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=J9lVLHDpL0BQuTcVdOUDRoWtqTV225dD9/jI3d5WkH0=; b=ysPaKMPpFh9Fn/JjOdG+oIITpp0VLzJETCL+uWqH4lic4NyfV3OTAgVrtxiYauiLO4Ff+l 0y5dpdTNePtkg5BP9cdYOQiigKEUbdULWaXIBeF6ctfRBbd9ocS0MwbZFrGqEbgpREcGeh nZoGaEtK6F0JHF1L9dtvCI/r8ATXJMF5c8apiAOwLZFxdO8grv/qYGeEjimJkH1bZxZQhd 6T2vKXqxnn+MfbtyucHvqoW3XY63+FI0Y4WcXAmX26gyQYaOVyIRCrRWtS05joVnzT6kCz obFksEbj2sWAm7CUFF4syzJvM4Q3+iWmTbUA4NlWGS2byoom8h/G4Wc07bNPVQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794997478; b=U3G4Rtu85zii1UFvxBFTjwMqmjRR84wTcHrxWzhOO1JwRNmqHqpPVsodd7oFHynzRSslOW j4tbF4difI4Eb6miJY6g/T0Gs940VFvV5uIT7M/BfLja9MWaIwmtSYElH4BRCPsPAfSL+3 v+ta/1aEfTOA3Ospq68eNzq2LXnHhueicpGhar9i+RYrbsRmDotbjLj0e+l99UOw0XCio9 KXD+IFg1E/nEBAqQLmWXtwE8IRE+KDyVAUf4WL7eMmcNRapArtW8FWjgUh4ObL/o4t92Ki a+FQPqT7ayqpp2eOJmBIS6JpyLvhfa7ekR4Zcz1byB+KpGVlw2cKI+GD8FYEGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794997478; 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=J9lVLHDpL0BQuTcVdOUDRoWtqTV225dD9/jI3d5WkH0=; b=l1lOoAk2IOQ1ruXfYnT4RWEu4to8K8wumkNQKq4eMWWBpuvT6W9BYqUPd0aNPXL7KPrHeq nrYnPrxaGO/qx3IjErVH/uonyH9SscXzyaoWC6W2/GVq+BLuixCaKAvAP6k8J1pHDgYQnD EsK2Cb78J5cGfIZ6va7XrAFNJOEcVXAAHTNVFaRpLPfSWNIVExbNasqD9rfsRLJCC9zb9k Onx0Y52OwlqGBx0PxgtwUbqOWRQL1/wzsyVpRzwfBCX6iFJwu5V5w+1CX9T4CTnwJswD+g Si+jLo6XQmf7ptjcvvCP4BuUsg9bkxeDetXuCMWwDcnxyl1jp/9sd+sypm54Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTyQF6Swzz1Nnv for ; Wed, 18 Nov 2026 10:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 51a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Nov 2026 10:24:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3dfca118f979 - main - sound: Busy the device in sysctl_dev_pcm_mode() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: 3dfca118f9796fbb0b23d7a09baf1867d3c2fabe Auto-Submitted: auto-generated Date: Wed, 18 Nov 2026 10:24:37 +0000 Message-Id: <6afd7ce5.51a9.2da9cad2@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3dfca118f9796fbb0b23d7a09baf1867d3c2fabe commit 3dfca118f9796fbb0b23d7a09baf1867d3c2fabe Author: Christos Margiolis AuthorDate: 2026-11-18 10:19:04 +0000 Commit: Christos Margiolis CommitDate: 2026-11-18 10:19:04 +0000 sound: Busy the device in sysctl_dev_pcm_mode() PCM_LOCK does not keep the device alive, so it does not protect this handler racing with pcm_unregister(). The sysctl is registered in the device's newbus context which outlives pcm_unregister(). Busy the device instead, as the other handlers do, and hold the topology lock across the registration check so that the device cannot start detaching between the check and the busy. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60509 --- sys/dev/sound/pcm/sound.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 3438b03d1ef1..22a9c25436ff 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -265,17 +265,25 @@ sysctl_dev_pcm_mode(SYSCTL_HANDLER_ARGS) int mode = 0; d = oidp->oid_arg1; - if (!PCM_REGISTERED(d)) + bus_topo_lock(); + if (!PCM_REGISTERED(d)) { + bus_topo_unlock(); return (ENODEV); + } + /* + * Do not give up the topology lock until the device is busied, or it + * might detach between unlocking and busying. + */ + PCM_ACQUIRE(d); + bus_topo_unlock(); - PCM_LOCK(d); if (d->playcount > 0) mode |= PCM_MODE_PLAY; if (d->reccount > 0) mode |= PCM_MODE_REC; if (d->mixer != NULL) mode |= PCM_MODE_MIXER; - PCM_UNLOCK(d); + PCM_RELEASE(d); return (sysctl_handle_int(oidp, &mode, 0, req)); }