diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-05-11 14:41:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-05-12 11:41:22 +0100 |
| commit | 97eea946b93961fffd29448dcda7398d0d51c4b2 (patch) | |
| tree | 067b24e77cec8d5759db4dc6c4ab14582996ba6f | |
| parent | ASoC: ops: Fix bounds check for _sx controls (diff) | |
| download | wireguard-linux-97eea946b93961fffd29448dcda7398d0d51c4b2.tar.xz wireguard-linux-97eea946b93961fffd29448dcda7398d0d51c4b2.zip | |
ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
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>
| -rw-r--r-- | sound/soc/soc-ops.c | 6 |
1 files changed, 6 insertions, 0 deletions
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, |