Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b2ecc91 authored by Marek Vasut's avatar Marek Vasut Committed by Greg Kroah-Hartman
Browse files

ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min 



commit 9bdd10d57a8807dba0003af0325191f3cec0f11c upstream.

While the $val/$val2 values passed in from userspace are always >= 0
integers, the limits of the control can be signed integers and the $min
can be non-zero and less than zero. To correctly validate $val/$val2
against platform_max, add the $min offset to val first.

Fixes: 817f7c9335ec0 ("ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()")
Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220215130645.164025-1-marex@denx.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 97968b46

sound/soc/soc-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 
		mask = BIT(sign_bit + 1) - 1;



	val = ucontrol->value.integer.value[0];

	if (mc->platform_max && val > mc->platform_max)

	if (mc->platform_max && ((int)val + min) > mc->platform_max)

		return -EINVAL;

	if (val > max - min)

		return -EINVAL;
@@ -336,7 +336,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 
	val = val << shift;

	if (snd_soc_volsw_is_stereo(mc)) {

		val2 = ucontrol->value.integer.value[1];

		if (mc->platform_max && val2 > mc->platform_max)

		if (mc->platform_max && ((int)val2 + min) > mc->platform_max)

			return -EINVAL;

		if (val2 > max - min)

			return -EINVAL;