From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A3B4EB64DD for ; Thu, 29 Jun 2023 19:04:12 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0B00320C; Thu, 29 Jun 2023 21:03:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0B00320C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1688065450; bh=B3Qj3GxL5pURfykTTTUYIrUoqGR9FF2dBBQFNMpaw2A=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=BugWWBi3Ipdkj2gkjl090bvWMl+sZXwlelANmDgKgYfZru1zu8U9xvSCIQGm/C+CC jg87J69mwS2h/ziCk96ee0iIsIXOJvzSJnvAmB2t2sxXAFoSHJLpXdXxQMbhH2HrrM FemGxxi2bl4B/oLhr2f1NoJgDr06s7z1e994urjY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id ACA28F805AF; Thu, 29 Jun 2023 21:02:33 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 64E9BF805A9; Thu, 29 Jun 2023 21:02:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1AFD3F805A9; Thu, 29 Jun 2023 21:02:30 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 09477F80246 for ; Thu, 29 Jun 2023 21:02:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 09477F80246 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=ZMb9bOeA Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CA44A61600; Thu, 29 Jun 2023 19:02:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16EA6C433C8; Thu, 29 Jun 2023 19:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688065346; bh=B3Qj3GxL5pURfykTTTUYIrUoqGR9FF2dBBQFNMpaw2A=; h=From:To:Cc:Subject:Date:From; b=ZMb9bOeAqrH4W3NmhnLBkSivstdyIeejQ17EnzhZpKR1GIpGwBxZBamuOdPJkdVv0 5AiBpoZ9GXEuOFeD6S+GGUxTzfrHK9Kr4P9ctJqbtIlRvJZfgkZaLp7CUXmR6YIMDO Fxn67TN+mCJBmMxLhHFOtln2j+IHYzQG1uYmqT4dmbQVBR3ozjmdynyv92MPD4bz+M 28lrWWXuB72SmhuB3qbLlhj+WiQgiKwu7UhBZ7gw1bD60345sq5X5VOU3JBs9nXliO iDu48HKo8OQ6aXzMfmRFHBu1bCBoSN4kgVitPym7k75xHhXjrAvmxVI2aGdUjFjlp6 08nuj0UWe7A1A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.14 1/4] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() Date: Thu, 29 Jun 2023 15:02:21 -0400 Message-Id: <20230629190225.908451-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.319 Content-Transfer-Encoding: 8bit Message-ID-Hash: YFF7IWXFXECWUONCYFZFNDONOWBHHE5L X-Message-ID-Hash: YFF7IWXFXECWUONCYFZFNDONOWBHHE5L X-MailFrom: sashal@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Mark Brown [ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ] The bounds checks in snd_soc_put_volsw_sx() are only being applied to the first channel, meaning it is possible to write out of bounds values to the second channel in stereo controls. Add appropriate checks. Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 81c9ecfa7c7f9..63c0e61b17541 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -465,6 +465,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { val_mask = mask << rshift; val2 = (ucontrol->value.integer.value[1] + min) & mask; + + if (mc->platform_max && val2 > mc->platform_max) + return -EINVAL; + if (val2 > max) + return -EINVAL; + val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.39.2