From nobody Sat Feb 28 14:02:47 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 4fNRjM6ss9z6TM2c for ; Sat, 28 Feb 2026 14:02:47 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNRjM5yWNz3QJv for ; Sat, 28 Feb 2026 14:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772287367; 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=u5H7lJzz21eQvWZQpD/mDyCZaphz9gGQMZl+4v0z9Kw=; b=AwmZ1JRaOdnKj8Edcz8ah4BYCjxCAgU94osMGgrvB3VHfj2tkZCBaV3t9T5mJq+EmdobyU vF/gjfSEpLnslkc+anK9colbZSnPRuFYmCaK9dNTe6EaEBcPgBJy6SAm81CSFaZFcpo/+b RkHqo2WZwATOEopiWi9Q4MKVl8rw79fRAOjDBF/Zn6YOSooefe45Ue7URrpkFxTijnNa2L 5dulWdeLrloqkFsr6+SGKrG+xCEeGKYSBPIBELkbeGRjbgTmj7tAeF72oix7sVIQrQuysb nvhxtjvlJq1SHb/NdwD9wv/BccADL6Q4BUYI/wcqGDdfl4LL/gjzoZ9hS8OgEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772287367; a=rsa-sha256; cv=none; b=lKO1JONl2czIcnbnNcl7qCfJH1lD712jYtfdg3eN8aWCCydsJ5T/JETf3nbvsdkJL3z02Y XffibO2ZVQVfA99TKLJ2XJNbjEaqu9dGENfeWH7a73SDpHcrftaoJjdGWpfyXgOxXcdN1g qysVaR5nN/GgDJWBZzB2vXqfHnIt2twmuzVemAjPOXiRHsqCSQ6RR9V9M1P2a+orTEn+Xg XpLxy0/Os1YXaweLxBZJc3Kh+jl8NNmxC6FU/HOaj2sJSJ31lIVjch6IDpYcgzIHMhAbsU LcM7edhN4lAxJYAhH0Lb+hbPe8Ly1T/JbEKPa/jjkbV6OB/BReyNjGgk9t0qGw== 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=1772287367; 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=u5H7lJzz21eQvWZQpD/mDyCZaphz9gGQMZl+4v0z9Kw=; b=lLA8xwon1HQvSJt/mM3iNEjgekrLAC6e6oAgNouO8/n9m0JdJ5bfn9L6lh0geJK/4LGvve 61YZ0ypFXlZu5tr5g1zfGSgODqwYOAaRnOvbxx66lahE6HMAw0yKWEfu4Z9+2hSPoc6NaT sqmRcxZvtwLZ7rAibU/ZjPJctoO/+fW70IGUzdTHDdM8GF/KL6DH91oca3mhVP0oG+hRFN 8U3QsGAZGZuQCfDGxQnAYu9hTh5hnMePMkLIgWIpcv/C7GHLdZWE1TMO4qn4Md7cHE1xLZ RBBYMKOUlgZex9feDfekfPRtMsIRa38q51dWRL2Mh5qoXbWcVPgJYB4f4XHWqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNRjM5Jdcz154T for ; Sat, 28 Feb 2026 14:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2247a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Feb 2026 14:02:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a9f454a9c798 - stable/15 - sound: Detect unsupported formats 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: a9f454a9c79810d60261d03dbec73c29396bf128 Auto-Submitted: auto-generated Date: Sat, 28 Feb 2026 14:02:47 +0000 Message-Id: <69a2f587.2247a.16865864@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a9f454a9c79810d60261d03dbec73c29396bf128 commit a9f454a9c79810d60261d03dbec73c29396bf128 Author: Christos Margiolis AuthorDate: 2026-02-21 11:36:58 +0000 Commit: Christos Margiolis CommitDate: 2026-02-28 14:02:39 +0000 sound: Detect unsupported formats This way we can avoid edge-cases like 8af6aee96ed609456900c6dd92dafabac5e89c0a ("virtual_oss(8): Remove floating point formats from preference list"). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D55403 (cherry picked from commit 3deae7b786743193531f4e69527e789de52644c5) --- sys/dev/sound/pcm/channel.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 011dc1427c2e..b74f76fd21ca 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -2092,9 +2092,23 @@ chn_setspeed(struct pcm_channel *c, uint32_t speed) int chn_setformat(struct pcm_channel *c, uint32_t format) { - uint32_t oldformat, oldspeed; + uint32_t oldformat, oldspeed, x; int ret; + /* + * Detect unsupported formats. This checks if the format is supported + * in the first place, and that no more than 1 format is specified at + * the same time. + */ + x = format & AFMT_CONVERTIBLE; + if ((x & (x - 1)) != 0) { + if (snd_verbose > 3) { + device_printf(c->dev, "%s(): Unsupported format: " + "0x%08x\n", __func__, format); + } + return (EINVAL); + } + /* XXX force stereo */ if ((format & AFMT_PASSTHROUGH) && AFMT_CHANNEL(format) < 2) { format = SND_FORMAT(format, AFMT_PASSTHROUGH_CHANNEL,