From nobody Tue Feb 25 12:17:32 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 4Z2Gnm6p9Pz5pm5j; Tue, 25 Feb 2025 12:17:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2Gnm5S58z47MG; Tue, 25 Feb 2025 12:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740485852; 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=ghb0wIBlps8DlYg0OxAXu+s+WpDnPtvdST66icCwRGU=; b=Q2ZuFohNNKP9Lwf9weJOsbWuOwG8wYy4INAD7d+tVLeRX82s23qn7ftQXmW+kvJYwhueBO /r1O2aNpKKBL18LCCAZZUM3Q56ANIhqHkijJc5uzVv4kIy9c4ubksfbUCK5hmbmlNeGlQe 8xd5bjQVxVcAHVYMOYKncXudA8OyljhDaYleC/kwlE5OCqDoxbva0uO6noyfFipfSg/W91 EjYyLZ0e0xfAz5qQAEAMAOULXCZQFSquXbam0JGjjGKL3/tql8ccN11WVFel9V5hctD8BU cHnJ2dEFsK/ywBGsmtH2K3EQcHbpkJ0MoUb5aDM48F0EArfXrCU+l72wr4EXvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740485852; a=rsa-sha256; cv=none; b=tX1RzknDm1Cj/Ghr1RAsIG+5mzln23ySQO0HxXHuHhd82WctJxOICg7OPR+XPqh1JBPQrp rrr9X6LvZs5aj1BBAMa/2PXFWuWhNOI/CIIkEqu4r2XcwNBmQLUUDr+vnEaAL7HKbtfP1C nytsc9GCfGpow9CcT9BmFk8GNfe+5e2Olu2l8LNGdDcR2sTkrnh2IAzLS/6cxEKMK+NxeL kWziXGA49FyJ/bhPHMnoYZ6TyorsOWs1ea6ihxWQuv18EtPFc+0KXHLhU7AU09maW1I8k4 +AWR4JpZ+VCOh2pKDWSBWFL3FIK71kXxiwzHmCPdPJ0KBOrlforbQi5fFTvarQ== 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=1740485852; 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=ghb0wIBlps8DlYg0OxAXu+s+WpDnPtvdST66icCwRGU=; b=MTDFQJTrQZ21bamC3NZvNC7ZuhccpeDw/vO7A4rbdjwieM3ZTrsdVFw9tXFaKrXOmI+w8z IqOx+aWXV/Sw+yukzBkSQSFUzAaRBfbVhMXKUZJc3xsN7r2Af+v9TY8JE2uTMhhgIO6qOp b8ZoneavTFyb+gRwkm6Jn5DMX/F3eEEirOONjHe/MxPJ0uTzhjzC/B0x3JLr5MPe9m/J1D guUOdnnQ3JhGdlO3dzV5OlKjq4baurYrJZ1EEpxqL5WAqMENnbD3zx0LlTEGMJq2zA2xRz 13uaP2eq+saDjXTYbF5aPvjd4T951KLNZZaP2T6JNoWs9PRYnx5FKfl6hEPRcw== 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 4Z2Gnm4xxBz9xF; Tue, 25 Feb 2025 12:17:32 +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 51PCHWCJ008076; Tue, 25 Feb 2025 12:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51PCHWsK008073; Tue, 25 Feb 2025 12:17:32 GMT (envelope-from git) Date: Tue, 25 Feb 2025 12:17:32 GMT Message-Id: <202502251217.51PCHWsK008073@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: 0611b649eb20 - stable/14 - sound: Bail out early if a format is not supported 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/14 X-Git-Reftype: branch X-Git-Commit: 0611b649eb20b258b31af7356b53a40f772529d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0611b649eb20b258b31af7356b53a40f772529d1 commit 0611b649eb20b258b31af7356b53a40f772529d1 Author: Christos Margiolis AuthorDate: 2025-02-18 19:36:48 +0000 Commit: Christos Margiolis CommitDate: 2025-02-25 12:17:15 +0000 sound: Bail out early if a format is not supported If a format is unsupported, the feeder_build_* functions will fail anyway, so bail out early to avoid unnecessary computation. This is also needed by a series of upcoming patches to the feeder framework. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48031 (cherry picked from commit 18457e7e25c55b8834e886fd925ec3b11b79d1b6) --- sys/dev/sound/pcm/feeder_chain.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 588bae2ff281..1c4ddca6cdd5 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -718,6 +718,17 @@ feeder_chain(struct pcm_channel *c) c->format = cdesc.target.afmt; c->speed = cdesc.target.rate; } else { + /* + * Bail out early if we do not support either of those formats. + */ + if ((cdesc.origin.afmt & AFMT_CONVERTIBLE) == 0 || + (cdesc.target.afmt & AFMT_CONVERTIBLE) == 0) { + device_printf(c->dev, + "%s(): unsupported formats: in=0x%08x, out=0x%08x\n", + __func__, cdesc.origin.afmt, cdesc.target.afmt); + return (ENODEV); + } + /* hwfmt is not convertible, so 'dummy' it. */ if (hwfmt & AFMT_PASSTHROUGH) cdesc.dummy = 1;