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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3423EB64D9 for ; Thu, 29 Jun 2023 19:08:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232968AbjF2TIP (ORCPT ); Thu, 29 Jun 2023 15:08:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232369AbjF2TFz (ORCPT ); Thu, 29 Jun 2023 15:05:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91D124688; Thu, 29 Jun 2023 12:02:27 -0700 (PDT) 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 CE1E061614; 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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