Skip to content

Commit

Permalink
ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()
Browse files Browse the repository at this point in the history
We don't currently validate that the values being set are within the range
we advertised to userspace as being valid, do so and reject any values
that are out of range.

Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220124153253.3548853-3-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Mark Brown committed Jan 25, 2022
1 parent 817f7c9 commit 4f1e50d
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion sound/soc/soc-ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
int err = 0;
unsigned int val, val_mask;

val = ucontrol->value.integer.value[0];
if (mc->platform_max && val > mc->platform_max)
return -EINVAL;
if (val > max - min)
return -EINVAL;
if (val < 0)
return -EINVAL;
val_mask = mask << shift;
val = (ucontrol->value.integer.value[0] + min) & mask;
val = (val + min) & mask;
val = val << shift;

err = snd_soc_component_update_bits(component, reg, val_mask, val);
Expand Down

0 comments on commit 4f1e50d

Please sign in to comment.