| Message ID | 20220511134137.169575-2-broonie@kernel.org |
|---|---|
| State | Accepted |
| Commit | 97eea946b93961fffd29448dcda7398d0d51c4b2 |
| Headers | show |
| Series | [1/2] ASoC: ops: Fix bounds check for _sx controls | expand |
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 1ac7e2ce31a1..7cac26a64e0c 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -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,
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> --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+)