From 97eea946b93961fffd29448dcda7398d0d51c4b2 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel.org>
Date: Wed, 11 May 2022 14:41:37 +0100
Subject: [PATCH] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
Git-commit: 97eea946b93961fffd29448dcda7398d0d51c4b2
Patch-mainline: v6.1-rc8
References: git-fixes
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 <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org
Acked-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/soc-ops.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -449,6 +449,12 @@ int snd_soc_put_volsw_sx(struct snd_kcon
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,