diff options
| author | Mark Brown <broonie@kernel.org> | 2022-01-24 16:32:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-01-25 11:21:34 +0100 |
| commit | 4f1e50d6a9cf9c1b8c859d449b5031cacfa8404e (patch) | |
| tree | a055a06d8e0472a17301373f53545e4ed0f57f5d /sound | |
| parent | ASoC: ops: Reject out of bounds values in snd_soc_put_volsw() (diff) | |
| download | linux-4f1e50d6a9cf9c1b8c859d449b5031cacfa8404e.tar.xz linux-4f1e50d6a9cf9c1b8c859d449b5031cacfa8404e.zip | |
ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-ops.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index fbe5d326b0f2..c31e63b27193 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -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); |