Commit f7a34446 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mark Brown

ASoC: max98090: Move check for invalid values before casting in max98090_put_enab_tlv()

Validation of signed input should be done before casting to unsigned int.

Found by Linux Verification Center (linuxtesting.org) with SVACE.
Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Suggested-by: default avatarMark Brown <broonie@kernel.org>
Fixes: 2fbe467b ("ASoC: max98090: Reject invalid values in custom control put()")
Link: https://lore.kernel.org/r/1652999486-29653-1-git-send-email-khoroshilov@ispras.ruSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent affa9983
...@@ -393,7 +393,8 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, ...@@ -393,7 +393,8 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc = struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value; (struct soc_mixer_control *)kcontrol->private_value;
unsigned int mask = (1 << fls(mc->max)) - 1; unsigned int mask = (1 << fls(mc->max)) - 1;
unsigned int sel = ucontrol->value.integer.value[0]; int sel_unchecked = ucontrol->value.integer.value[0];
unsigned int sel;
unsigned int val = snd_soc_component_read(component, mc->reg); unsigned int val = snd_soc_component_read(component, mc->reg);
unsigned int *select; unsigned int *select;
int change; int change;
...@@ -414,8 +415,9 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, ...@@ -414,8 +415,9 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
val = (val >> mc->shift) & mask; val = (val >> mc->shift) & mask;
if (sel < 0 || sel > mc->max) if (sel_unchecked < 0 || sel_unchecked > mc->max)
return -EINVAL; return -EINVAL;
sel = sel_unchecked;
change = *select != sel; change = *select != sel;
*select = sel; *select = sel;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment