From nobody Sat Feb 21 11:37:07 2026 X-Original-To: dev-commits-src-main@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 4fJ4pX2mvKz6STks for ; Sat, 21 Feb 2026 11:37:08 +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 4fJ4pX0GPjz3JrB for ; Sat, 21 Feb 2026 11:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771673828; 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=a5hxo0lqTEdZJLIv6XSwqL/XTD+rlWepCQ+IV7gM8u8=; b=csnuOFFzEbbnbRID5dUYqNW8l7o6D1ZHvQyaVNBsnEGAiP94Bu0qOkXRL/IPil2RAdzrnK 2y3o6zznNBHzXjJ0odU4LgTVLu3C8QxPIsOgdoKG+RHPDoGewEPyLreQVVCsY7v5CroImc NtEJgw7x29BAH1fLo3S7uS7TjP5jWeSz3rQQMqK16Vlp7RUxxQTNkdAiB2sfmJHv4qA9fh KHocRW2sKtuKEH817z1ciIN/8Wcu7gXOIKt2k90C+XODhDKCJsSKL2l6L+FRCz38b+EGrj 1yuwUfz2rs1Vz0PbnAlxgJ9XISN3jPisk1vKpeiIRG3RidoM7kizPj/vnWPuhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771673828; a=rsa-sha256; cv=none; b=DxzSUHMAwNUucyyilLOQI960X1XnJc/zM4zxueUhf/Zker2A60xY3q3HcoCIJM5yizyUc/ Itaf3QjVq6/fZGz226SaENmF5QRv3uP8r3ZoXvU/D9F3O7BFOHZK743ykxt/cjVAIW07Wz E2h0hAKmNJ5DPfRGGAv0kBbQ7Lh5ZsuDRPJPg7I8bZ86eRERYFX6Tm066SqEahBk+CbnbD 0zrgDn4MHBAmUxeLi2ZatLwJJjKepi39KuHHSjlfPUiqQuPJPhOMZ5eZc+5hJ0LMZTSyL7 3ABFeCdQ6yPxiIb1SpIxGZl3o+3iJjMsPBM66CdrrkJ8tUJI0hcL3c0xAkkrbw== 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=1771673828; 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=a5hxo0lqTEdZJLIv6XSwqL/XTD+rlWepCQ+IV7gM8u8=; b=ddr2nTqduzuHp2mjWOZ1JOIJ8EUIhHUguZJpOvHWCmTR42LDqTDxXDMN8zN4VG4l7/ajO5 snAq/hX3Zf+z0KzG+R3jbaPCSwYHFJHwakqEkbYCza9qYWvj3I0ru1WU3KQbz85EUiMXvT ZOK9L0EfuyGo8X98AL26er/cohYRs2o+mTixFvOezes28kRVJraP8teW1UPmpx5PyAxIhs T4l4uLQzdCGcichGTwEciEjwn3ObBRGRv4rrEGjDJ1S4EAzsOa2ZAy2iWG527BTaxRB+W3 0bsMUJck+14FzrXdKjZuq5N84leWPrG5vnBCqY7qOzD0CyXhWUgEYYwe+sSM1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ4pW6tGBz1C0M for ; Sat, 21 Feb 2026 11:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 11:37:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3deae7b78674 - main - sound: Detect unsupported formats List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3deae7b786743193531f4e69527e789de52644c5 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 11:37:07 +0000 Message-Id: <699998e3.33f29.6e57e469@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3deae7b786743193531f4e69527e789de52644c5 commit 3deae7b786743193531f4e69527e789de52644c5 Author: Christos Margiolis AuthorDate: 2026-02-21 11:36:58 +0000 Commit: Christos Margiolis CommitDate: 2026-02-21 11:36:58 +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 --- 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,