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 AF6F9C3A5A7 for ; Tue, 6 Dec 2022 09:54:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235630AbiLFJyl (ORCPT ); Tue, 6 Dec 2022 04:54:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235550AbiLFJwf (ORCPT ); Tue, 6 Dec 2022 04:52:35 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0492275FA; Tue, 6 Dec 2022 01:51:35 -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 0A198B818E4; Tue, 6 Dec 2022 09:51:34 +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 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: 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 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 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