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

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.ru


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent affa9983

sound/soc/codecs/max98090.c

+4 −2
Original line number Diff line number Diff line
@@ -393,7 +393,8 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, 
	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	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 *select;

	int change;
@@ -414,8 +415,9 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, 


	val = (val >> mc->shift) & mask;



	if (sel < 0 || sel > mc->max)

	if (sel_unchecked < 0 || sel_unchecked > mc->max)

		return -EINVAL;

	sel = sel_unchecked;



	change = *select != sel;

	*select = sel;