diff options
| author | Mark Brown <broonie@kernel.org> | 2024-01-03 18:34:01 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-15 18:48:05 +0100 |
| commit | 85f8d007deabbfdd51b640c6741defc7f57ec06f (patch) | |
| tree | 67debe03a2d7f0147bf3b9903f56ab93fab8df2f | |
| parent | 21ecce245624cf61c70c5a5a75f544d5f086fcb5 (diff) | |
| download | linux-85f8d007deabbfdd51b640c6741defc7f57ec06f.tar.gz linux-85f8d007deabbfdd51b640c6741defc7f57ec06f.tar.bz2 linux-85f8d007deabbfdd51b640c6741defc7f57ec06f.zip | |
ASoC: meson: g12a-toacodec: Validate written enum values
[ Upstream commit 3150b70e944ead909260285dfb5707d0bedcf87b ]
When writing to an enum we need to verify that the value written is valid
for the enumeration, the helper function snd_soc_item_enum_to_val() doesn't
do it since it needs to return an unsigned (and in any case we'd need to
check the return value).
Fixes: af2618a2eee8 ("ASoC: meson: g12a: add internal DAC glue driver")
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20240103-meson-enum-val-v1-1-424af7a8fb91@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | sound/soc/meson/g12a-toacodec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/meson/g12a-toacodec.c b/sound/soc/meson/g12a-toacodec.c index 9339fabccb79..0938f590de22 100644 --- a/sound/soc/meson/g12a-toacodec.c +++ b/sound/soc/meson/g12a-toacodec.c @@ -46,6 +46,9 @@ static int g12a_toacodec_mux_put_enum(struct snd_kcontrol *kcontrol, struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; unsigned int mux, changed; + if (ucontrol->value.enumerated.item[0] >= e->items) + return -EINVAL; + mux = snd_soc_enum_item_to_val(e, ucontrol->value.enumerated.item[0]); changed = snd_soc_component_test_bits(component, e->reg, CTRL0_DAT_SEL, |