diff options
| author | Mark Brown <broonie@kernel.org> | 2022-01-24 15:32:52 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-08 18:15:28 +0100 |
| commit | 9e5c40b5706d8aae2cf70bd7e01f0b4575a642d0 (patch) | |
| tree | 510b0b5186b90286c9e9ab4c264497446cc6464a | |
| parent | 40f598698129b5ceaf31012f9501b775c7b6e57d (diff) | |
| download | linux-9e5c40b5706d8aae2cf70bd7e01f0b4575a642d0.tar.gz linux-9e5c40b5706d8aae2cf70bd7e01f0b4575a642d0.tar.bz2 linux-9e5c40b5706d8aae2cf70bd7e01f0b4575a642d0.zip | |
ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()
commit 4f1e50d6a9cf9c1b8c859d449b5031cacfa8404e upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 fe7fe1f15432..515d4a876ff3 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -441,8 +441,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, int err = 0; unsigned int val, val_mask, val2 = 0; + 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); |