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

Commit 9796d07c authored by Mark Brown's avatar Mark Brown Committed by Greg Kroah-Hartman
Browse files

ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() 



[ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ]

The bounds checks in snd_soc_put_volsw_sx() are only being applied to the
first channel, meaning it is possible to write out of bounds values to the
second channel in stereo controls. Add appropriate checks.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3c837460

sound/soc/soc-ops.c

+6 −0
Original line number Diff line number Diff line
@@ -460,6 +460,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 
	if (snd_soc_volsw_is_stereo(mc)) {

		val_mask = mask << rshift;

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



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

			return -EINVAL;

		if (val2 > max)

			return -EINVAL;



		val2 = val2 << rshift;



		err = snd_soc_component_update_bits(component, reg2, val_mask,