Unverified Commit 817f7c93 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: ops: Reject out of bounds values in snd_soc_put_volsw() 



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: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220124153253.3548853-2-broonie@kernel.org


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

sound/soc/soc-ops.c

+16 −2
Original line number Diff line number Diff line
@@ -316,13 +316,27 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 
	if (sign_bit)

		mask = BIT(sign_bit + 1) - 1;



	val = ((ucontrol->value.integer.value[0] + min) & mask);

	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 = (val + min) & mask;

	if (invert)

		val = max - val;

	val_mask = mask << shift;

	val = val << shift;

	if (snd_soc_volsw_is_stereo(mc)) {

		val2 = ((ucontrol->value.integer.value[1] + min) & mask);

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

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

			return -EINVAL;

		if (val2 > max - min)

			return -EINVAL;

		if (val2 < 0)

			return -EINVAL;

		val2 = (val2 + min) & mask;

		if (invert)

			val2 = max - val2;

		if (reg == reg2) {