From nobody Sun Oct 26 14:22:23 2025 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 4cvf3h1R1Zz6DHWZ; Sun, 26 Oct 2025 14:22:24 +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 4cvf3g2QS1z3SfC; Sun, 26 Oct 2025 14:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761488543; 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=T+p1Puwn1lgP4YldiMQs0/itADPvNEE3uydc2tc3w2o=; b=XStoc8CN/cF7LDs0FqwlyzKLXwjM+aQtFVAgoJbb2wo6CnearKTrlCWe/ib7zjXdC/xX6s YMsjWEOSS6dpldDCGJr3KaJk3cpb+U6YCHk3vuuszf27rC4E/Rvf6NAlsLAkF/NcVSeAgf UtOc7WnF3ThKt66m9/gG819gBk+OrlH3apKoWOB2yaWA/kmA4ayQeXYuh5lrXbWEdUzH6G /eJsldANmf6+Hu6sxzlR5NFdwnrw3EcOM6AHePslHz+VCJDydVTGx2VOQkd9NkMZc7iFZk Qrq1teN+5rW99bId9tzBFCZ9uNXOfDmpnQZbTmBOQeUtZ15TlQ/9dLBYBN7EnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761488543; 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=T+p1Puwn1lgP4YldiMQs0/itADPvNEE3uydc2tc3w2o=; b=Lm3XCUSfczmmBZkbrMacNj3s1Eq1y1pE0FlgU5PLaUrmRLb2zlXw49amHWX1fs4PhP2Ejm bTneDOKkADLkjJlMAJC7ZKX8dN4BQld1ZO2u1zquwDcPDb3wfAMLTqe5XBkg5Fvgysjl49 8vqRaSisUWowk5NbSsBbF1yYGFGkYRrARcUb3ED2aAHmY/+LPOf2fN7/ZXc/8B0W/k7hPp 2fiVmON221vnqZpBgKwviF1fOpmWIk8rR3K7o/qHKTG07jRrDYzj2mIOjljGb2XpELviUa WJQjtZYy8Kb6XyWZJMg0S/OHWFNFwYLlsKaCHZTbng03l+GcW7UzZT1i8dgJ1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761488543; a=rsa-sha256; cv=none; b=gw5q6jcKWqMF+EKWZUQkqdZy/JB5sIUsCur99JqUGPc1i5DKBqimbaBXTbu+bxZVHuawC+ oqF6iVKasDNBstI9sRe/R8+H5xMDv3XsA4THavImd+d2Qwdo8Le8Zp/jSxHPzp0W9lgdTS JZLuB0M3Y0ZJ8JXvRBUuuJfNIBCdG0k+pzMhee2Li/J9hw/d/oJ4ynu0BwsUX1PWNWvkcZ 8iNR2C4W0dS5CXd4xuyra2xQqNxy125HwYPBykRyCKdmBnYRCqVV9895N+Ka1q6F1WfOwj y/hY45RhmybpK0pClRalwM0nH9ygAhFHKoJlnv6DLX1p4mWQY8P3mLLtpYLSFA== 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 4cvf3g1xqczd48; Sun, 26 Oct 2025 14:22:23 +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 59QEMNYL019871; Sun, 26 Oct 2025 14:22:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QEMNFp019868; Sun, 26 Oct 2025 14:22:23 GMT (envelope-from git) Date: Sun, 26 Oct 2025 14:22:23 GMT Message-Id: <202510261422.59QEMNFp019868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e015e079f9db - stable/15 - sndctl(8): Modify vchans only on supported directions 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 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: e015e079f9db0e1762e4249bdc76abec93213abc Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e015e079f9db0e1762e4249bdc76abec93213abc commit e015e079f9db0e1762e4249bdc76abec93213abc Author: Christos Margiolis AuthorDate: 2025-10-22 11:50:55 +0000 Commit: Christos Margiolis CommitDate: 2025-10-26 14:22:11 +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. Sponsored by: The FreeBSD Foundation MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D53233 (cherry picked from commit 70b34fbdbea13c006a724844caa53f59e0e53bd0) --- 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);