From: Mark Brown Date: Mon, 24 Jan 2022 15:32:52 +0000 (+0000) Subject: ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx() X-Git-Tag: v4.19.228~31 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9a12fcbf3c622f9bf6b110a873d62b0cba93972e;p=users%2Fdwmw2%2Flinux.git 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 Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220124153253.3548853-3-broonie@kernel.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index ee1c87904d5bf..3980b1727c493 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -436,8 +436,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);