| From 4f1e50d6a9cf9c1b8c859d449b5031cacfa8404e Mon Sep 17 00:00:00 2001 |
| From: Mark Brown <broonie@kernel.org> |
| Date: Mon, 24 Jan 2022 15:32:52 +0000 |
| Subject: ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx() |
| |
| From: Mark Brown <broonie@kernel.org> |
| |
| 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> |
| --- |
| sound/soc/soc-ops.c | 9 ++++++++- |
| 1 file changed, 8 insertions(+), 1 deletion(-) |
| |
| --- a/sound/soc/soc-ops.c |
| +++ b/sound/soc/soc-ops.c |
| @@ -423,8 +423,15 @@ int snd_soc_put_volsw_sx(struct snd_kcon |
| 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); |