diff options
| author | Mark Brown <broonie@kernel.org> | 2022-05-11 14:41:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-12-19 12:27:31 +0100 |
| commit | 50b5f6d4d9d2d69a7498c44fd8b26e13d73d3d98 (patch) | |
| tree | 8302920f76ecd7f24e5c7c1f6c0267c3536e6024 | |
| parent | 344739dc56f1b3e33e6a3170b89731d450455df6 (diff) | |
| download | linux-stable-50b5f6d4d9d2d69a7498c44fd8b26e13d73d3d98.tar.gz linux-stable-50b5f6d4d9d2d69a7498c44fd8b26e13d73d3d98.tar.bz2 linux-stable-50b5f6d4d9d2d69a7498c44fd8b26e13d73d3d98.zip | |
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: 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>
Signed-off-by: Sasha Levin <sashal@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 5fdd96e77ef3..fe93458d864a 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -447,6 +447,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, |