Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc00b8c authored by Mark Brown's avatar Mark Brown Committed by Greg Kroah-Hartman
Browse files

ASoC: meson: g12a-tohdmitx: Validate written enum values 



[ Upstream commit 1e001206804be3f3d21f4a1cf16e5d059d75643f ]

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: c8609f38 ("ASoC: meson: add g12a tohdmitx control")
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20240103-meson-enum-val-v1-2-424af7a8fb91@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fe2d1dda

sound/soc/meson/g12a-tohdmitx.c

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ static int g12a_tohdmitx_i2s_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_I2S_DAT_SEL,
@@ -92,6 +95,9 @@ static int g12a_tohdmitx_spdif_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, TOHDMITX_CTRL0,

					      CTRL0_SPDIF_SEL,