Skip to content

Commit

Permalink
ASoC: ops: Correct bounds check for second channel on SX controls
Browse files Browse the repository at this point in the history
commit f33bcc5 upstream.

Currently the check against the max value for the control is being
applied after the value has had the minimum applied and been masked. But
the max value simply indicates the number of volume levels on an SX
control, and as such should just be applied on the raw value.

Fixes: 97eea94 ("ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221125162348.1288005-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Charles Keepax authored and Greg Kroah-Hartman committed Dec 19, 2022
1 parent 74b139c commit 54c15f6
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sound/soc/soc-ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,14 +445,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
return err;

if (snd_soc_volsw_is_stereo(mc)) {
val_mask = mask << rshift;
val2 = (ucontrol->value.integer.value[1] + min) & mask;
val2 = ucontrol->value.integer.value[1];

if (mc->platform_max && val2 > mc->platform_max)
return -EINVAL;
if (val2 > max)
return -EINVAL;

val_mask = mask << rshift;
val2 = (val2 + min) & mask;
val2 = val2 << rshift;

err = snd_soc_component_update_bits(component, reg2, val_mask,
Expand Down

0 comments on commit 54c15f6

Please sign in to comment.