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 9FA61C4708E for ; Tue, 6 Dec 2022 09:54:39 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CDFF2187A; Tue, 6 Dec 2022 10:53:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CDFF2187A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1670320477; bh=HsTiICicKSyH57HqavP3sEZeZRewi0FhjJPci2xo5Uc=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=afhKx4Q/ppJ+PH5su+lHfZBuZ6tAKcHo15G8qV5w7CfdN9jN+LKedePC00y34AQJC +zYl9yQCRdlefLi0gHJGPtArK8LZWz26Q2iIsocyyHrGreQaHC05RnlDjfkiyaMg6t k2IcE49s8flgJx2ejtonkpBQH1rWkygS8wSTa6i0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 29019F80567; Tue, 6 Dec 2022 10:51:57 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2E153F80588; Tue, 6 Dec 2022 10:51:55 +0100 (CET) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2A20DF80563 for ; Tue, 6 Dec 2022 10:51:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2A20DF80563 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sJL9//e8" 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 674B6B818E6; Tue, 6 Dec 2022 09:51:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B214C433C1; Tue, 6 Dec 2022 09:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670320307; bh=HsTiICicKSyH57HqavP3sEZeZRewi0FhjJPci2xo5Uc=; h=From:To:Cc:Subject:Date:From; b=sJL9//e8sIl21vM69//ZmsJzbS7LOSFHQfyiQuX9pa4DoFaRWdXCtSrxtrUbgKVqo Vw2GamB/OC8RU95kgJ9qPYaE57DxKeVJXUzrSxmWCJKBVOnecMKxtl/QyeRBlYAmNE eYDSEzIhqakY4OqGaLluIhnRif920TpCnyG3TFQagiig80EPuJzr+ACCa5D06DxhIi RfyoghwYSJqt6QbtG3Fk45MERj9OueOnVMku25VrtBxeTlbSmWBzOGit6t1wLK2nEO jD/pJ1VUWv5QivKAUUSEhvuYKa2gVgcu2WT0Fx3Bau8sAlDBy1IFU4v+9X2CRhQbrs XfR/bbzPFPh/Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 1/3] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() Date: Tue, 6 Dec 2022 04:51:40 -0500 Message-Id: <20221206095143.987934-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Cc: Sasha Levin , alsa-devel@alsa-project.org, tiwai@suse.com, lgirdwood@gmail.com, Mark Brown X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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 4fda8c24be29..7129bb685b63 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.35.1