Skip to content

Commit

Permalink
ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
Browse files Browse the repository at this point in the history
[ Upstream commit 97eea94 ]

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
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Mark Brown authored and Greg Kroah-Hartman committed Dec 19, 2022
1 parent 344739d commit 50b5f6d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions sound/soc/soc-ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 50b5f6d

Please sign in to comment.