From nobody Tue Oct 28 21:23:35 2025 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 4cx3Jl3tThz6DVhh; Tue, 28 Oct 2025 21:23:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx3Jl3F4rz3lJc; Tue, 28 Oct 2025 21:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761686615; 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=eZfWOaDg4AEh5t1gMDTJtxrsEyYm0zcXJTGg0Ik88Lo=; b=Cyf0q4nawDequVcwL0ecn75gRTNdMy41Iz+El1sE5eP+7x4mdS1Z9zR6LjMblUgM46JN46 xTPvlPmA044zqkF3fCwE5ySHT/bS/vxiVDvvhXMzsrBoPwXQqh8WYPH8uJYqFywroZTzSf ElEhoMeEJFZHU180O+/AGK3XOX5fcUFGNoOrX9tjqCTXxNl7jeKdX0xtYW/5h9iPOYNQHA bkBdebybpqnwye5jIhLHOm+czmWwNe4Zuq1EJcXvs5e1t08/4t5Tfr1Mtfx9p+04+Oakac OtDWMq3GAsFJJwJfUy2dm//+KFh3fUd6dA+rQ8++ypdvAirdxczp/7KXdOsc/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761686615; 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=eZfWOaDg4AEh5t1gMDTJtxrsEyYm0zcXJTGg0Ik88Lo=; b=uKfM1vGp4/qamvXajA6vFvs1cBdXd0EoQcsYNS07Vbdx6XLl0MiZ9LyMAV2Hrkd/POkosC lSG3a2Fra3Ygziojf6LsbMSlV9M2kqT1xvsP6uXDR4UnhpE8nPPaVcV4DEJ6lzbuLMffNh /g5Myf8T8EYJX7JwDyBDsaVqBI3AIkZEJOPCVpGzN5rw9ovhadfJJnXhaeZ9MyOwUIkAhW RDbUYvEfNh5VWJAIlc0NmiBHvMniq9NzV3f/lOKqBDaVLvGF3tYrsT+l+FcaXhNgx0X5eq fGof0px6ZgrO493S1sRGZbJ7ZTXTFb0lR95AJkvaqUK9oIwJEiNEc8jSBYrbmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761686615; a=rsa-sha256; cv=none; b=CzeVxw29EPPntHjTER0Ze/XOYrX061CY+nxJIOsqlUkCc1+xvWWBZ7WRaXbF/0AyFj8/Bl XMTOST5Z2DcDNXzyQQD+tmTkX4w4ch+W9KTXkpEWTfrOR7Vj7PBoIl7zH1iZr9f2qBVRPe yFYIO2fuABAWhe/1DZ9RhK77DDdXoPHuF2TNmORoAMUDwFcyyvgNlak3WixyklHMMadtAc Ko6GfN1zaQxJ9MCa6e7mvW3RKoFlhVCHhOLpscHRbrfGKn5UTKE3lAP88ECfFzjcxu6wVe 4CjNIMdrZNmmjZPuYiY/sY7Cq1QtiVTPwMV6hVUYyD73LOTTvxJMgaQlS0RzVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cx3Jl2p3Hz16TG; Tue, 28 Oct 2025 21:23:35 +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 59SLNZMD075437; Tue, 28 Oct 2025 21:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SLNZfi075434; Tue, 28 Oct 2025 21:23:35 GMT (envelope-from git) Date: Tue, 28 Oct 2025 21:23:35 GMT Message-Id: <202510282123.59SLNZfi075434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 470fae965fc2 - releng/15.0 - sndctl(8): Modify vchans only on supported directions 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 470fae965fc2a458a20cbc1df2710486ae5d536d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=470fae965fc2a458a20cbc1df2710486ae5d536d commit 470fae965fc2a458a20cbc1df2710486ae5d536d Author: Christos Margiolis AuthorDate: 2025-10-22 11:50:55 +0000 Commit: Colin Percival CommitDate: 2025-10-28 21:22:43 +0000 sndctl(8): Modify vchans only on supported directions Currently mod_play_vchans() and mod_rec_vchans() run unconditionally, even if the direction (playback, recording) is not supported by the device. This results in the "autoconv" (see mod_autoconv()) control failing when run on simplex devices, because we'll be trying to modify vchans on an unsupported direction. Test whether the direction is supported and silently move on if it isn't. Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D53233 (cherry picked from commit 70b34fbdbea13c006a724844caa53f59e0e53bd0) (cherry picked from commit e015e079f9db0e1762e4249bdc76abec93213abc) --- usr.sbin/sndctl/sndctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index 156c845481c5..6977f0ab0ebe 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -830,6 +830,8 @@ mod_play_vchans(struct snd_dev *dp, void *arg) if (dp->from_user) return (-1); + if (!dp->play.pchans) + return (0); snprintf(buf, sizeof(buf), "dev.pcm.%d.play.vchans", dp->unit); @@ -873,6 +875,8 @@ mod_rec_vchans(struct snd_dev *dp, void *arg) if (dp->from_user) return (-1); + if (!dp->rec.pchans) + return (0); snprintf(buf, sizeof(buf), "dev.pcm.%d.rec.vchans", dp->unit);