ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
authorMark Brown <broonie@kernel.org>
Wed, 11 May 2022 13:41:37 +0000 (14:41 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 12 May 2022 10:41:22 +0000 (11:41 +0100)
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: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-ops.c

index 1ac7e2ce31a1855c8219050d0c638833d76cb483..7cac26a64e0cb49b729ed798e06b05a52c03596b 100644 (file)
@@ -451,6 +451,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
 
                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,