projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d715f29
)
ASoC: meson: g12a-toacodec: Validate written enum values
author
Mark Brown
<broonie@kernel.org>
Wed, 3 Jan 2024 18:34:01 +0000
(18:34 +0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 10 Jan 2024 16:16:51 +0000
(17:16 +0100)
[ 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>
sound/soc/meson/g12a-toacodec.c
patch
|
blob
|
history
diff --git
a/sound/soc/meson/g12a-toacodec.c
b/sound/soc/meson/g12a-toacodec.c
index
6c45037
..
dd7f07d
100644
(file)
--- a/
sound/soc/meson/g12a-toacodec.c
+++ b/
sound/soc/meson/g12a-toacodec.c
@@
-71,6
+71,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, reg;
+ if (ucontrol->value.enumerated.item[0] >= e->items)
+ return -EINVAL;
+
mux = snd_soc_enum_item_to_val(e, ucontrol->value.enumerated.item[0]);
regmap_field_read(priv->field_dat_sel, ®);