diff options
| author | Mark Brown <broonie@kernel.org> | 2022-01-24 15:32:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-01-25 10:21:33 +0000 |
| commit | 817f7c9335ec01e0f5e8caffc4f1dcd5e458a4c0 (patch) | |
| tree | 05a80e4476383e6f4768794beb6bc81ed5379c8e /sound | |
| parent | 248be352bbae1a0f14d0d3511a5b0bb9665097f5 (diff) | |
| download | linux-rpi-817f7c9335ec01e0f5e8caffc4f1dcd5e458a4c0.tar.gz linux-rpi-817f7c9335ec01e0f5e8caffc4f1dcd5e458a4c0.tar.bz2 linux-rpi-817f7c9335ec01e0f5e8caffc4f1dcd5e458a4c0.zip | |
ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()
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-2-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-ops.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 08eaa9ddf191..fbe5d326b0f2 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -316,13 +316,27 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, if (sign_bit) mask = BIT(sign_bit + 1) - 1; - val = ((ucontrol->value.integer.value[0] + min) & 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 = (val + min) & mask; if (invert) val = max - val; val_mask = mask << shift; val = val << shift; if (snd_soc_volsw_is_stereo(mc)) { - 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 - min) + return -EINVAL; + if (val2 < 0) + return -EINVAL; + val2 = (val2 + min) & mask; if (invert) val2 = max - val2; if (reg == reg2) { |