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 301BBC3A5A7 for ; Tue, 6 Dec 2022 09:53:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235400AbiLFJxB (ORCPT ); Tue, 6 Dec 2022 04:53:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232353AbiLFJv0 (ORCPT ); Tue, 6 Dec 2022 04:51:26 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3D22220F8; Tue, 6 Dec 2022 01:50:38 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9A50EB818E3; Tue, 6 Dec 2022 09:50:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16EDEC433B5; Tue, 6 Dec 2022 09:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670320236; bh=Pap3IXlxYGjtoVqTTttxLkOIKQGEOJpAlGo/M5eslcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QsC7OHVuEofxnx4tt9748b0XPDG5agAqOdpvzElmY9miEDu+WvgN1MAqn+ig3Ol2Y yoHrF4wL7R3jHranNH5RIT/rU1JN9qes9iXh3Y3+I4WoDqcGEa0ISEw+lO0AsMecbx L7QPQoftCxXJh+8brE/Dih5luiGWvBPsgK4XXZbUwxFrTdtu8ITHxe3QZSlvdduipr 0Ne9x/TfM9ROr1wm9Ue5KHq9peroEuNGs8RKt8W0VlwqC1LxjWr9Cft0vNQv4sUvF2 w1t/GnfjDwTMruXOBHmq8u/XCtQsmK3qnIfo+r6UclCVQ4ZfVpWBZY0rAi2YjWkOVg 68FCfSZuro18A== 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 5.10 03/10] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() Date: Tue, 6 Dec 2022 04:50:20 -0500 Message-Id: <20221206095027.987587-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221206095027.987587-1-sashal@kernel.org> References: <20221206095027.987587-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 0f26d6c31ce5..49d22233d391 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -447,6 +447,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.35.1