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 9B5C5C352A1 for ; Tue, 6 Dec 2022 09:54:14 +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 D0F14188A; Tue, 6 Dec 2022 10:53:22 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D0F14188A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1670320452; bh=1Bf9GCm8AZW7lmj1bhwpCTr4q/GISDbVYZ43CjHc0EY=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=SNAOv591+OHi6DcrA7ow5GrOnocvi1hAOekz5sTkQBbc99paWWMJ7HC0LzdcEAOwQ Wboez91bP8mwcqD/35fDlthDAnFhnRedEkDxA41YoGpwqsapQdqaN1/ahQM+XO2JMf 9RGHIe7fon4aVtYIJ/ec+74f2rnPprRQ7OB/Gdw0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5AED4F80571; Tue, 6 Dec 2022 10:51:37 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 44CF9F80571; Tue, 6 Dec 2022 10:51:36 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 019E5F80290 for ; Tue, 6 Dec 2022 10:51:33 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 019E5F80290 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="el9E5RSu" 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 dfw.source.kernel.org (Postfix) with ESMTPS id EDE7F61610; Tue, 6 Dec 2022 09:51:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F00FC433D7; Tue, 6 Dec 2022 09:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670320292; bh=1Bf9GCm8AZW7lmj1bhwpCTr4q/GISDbVYZ43CjHc0EY=; h=From:To:Cc:Subject:Date:From; b=el9E5RSuY5EKwkwvT0guSdT+Ts0c9ixTo+s0PUTkGsBjxCD4xeCyPxPgBk9gBcFgD wHBXucdXFsVLqMt9xuKfdgHz75HdvFqRuIB+ltflUrJam+dYZkayvm7ZsndX8P+5F/ DDttl+v/WUmFaHip3HMQUxA0/3EMX64Ew/AjrL9gb+P2K7ypELZUQgXCrwPDN/t3eS kVKmswhC1nKpNbgkaPd/Ep2xiEAc7FZNBLfs5VsxBVdyd0hbgn9IDJ0FncjqJ651tf 2FaPw5Ry4mtzoSFm9DmslzfT2CNb6rkSZEOyuvGrhktwZYu87x4BNoEJDfQiSkskgi 2J50xUJfjwkqw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 1/4] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() Date: Tue, 6 Dec 2022 04:51:25 -0500 Message-Id: <20221206095128.987873-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 81c9ecfa7c7f..63c0e61b1754 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