Skip to content

Commit 1e00120

Browse files
committed
ASoC: meson: g12a-tohdmitx: Validate written enum values
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: c8609f3 ("ASoC: meson: add g12a tohdmitx control") Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20240103-meson-enum-val-v1-2-424af7a8fb91@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 3150b70 commit 1e00120

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

sound/soc/meson/g12a-tohdmitx.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ static int g12a_tohdmitx_i2s_mux_put_enum(struct snd_kcontrol *kcontrol,
4545
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
4646
unsigned int mux, changed;
4747

48+
if (ucontrol->value.enumerated.item[0] >= e->items)
49+
return -EINVAL;
50+
4851
mux = snd_soc_enum_item_to_val(e, ucontrol->value.enumerated.item[0]);
4952
changed = snd_soc_component_test_bits(component, e->reg,
5053
CTRL0_I2S_DAT_SEL,
@@ -93,6 +96,9 @@ static int g12a_tohdmitx_spdif_mux_put_enum(struct snd_kcontrol *kcontrol,
9396
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
9497
unsigned int mux, changed;
9598

99+
if (ucontrol->value.enumerated.item[0] >= e->items)
100+
return -EINVAL;
101+
96102
mux = snd_soc_enum_item_to_val(e, ucontrol->value.enumerated.item[0]);
97103
changed = snd_soc_component_test_bits(component, TOHDMITX_CTRL0,
98104
CTRL0_SPDIF_SEL,

0 commit comments

Comments
 (0)