]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: meson: g12a-toacodec: Validate written enum values
authorMark Brown <broonie@kernel.org>
Wed, 3 Jan 2024 18:34:01 +0000 (18:34 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jan 2024 17:48:05 +0000 (18:48 +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

index 9339fabccb7963dffc1f3a8466da4ea5d386567f..0938f590de226ce76d297ad9862c81db28d38fa6 100644 (file)
@@ -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,