[PATCH v2 2/2] ASoC: SOF: control: Reject out of range volume and switch values
From: HyeongJun An
Date: Wed Nov 18 2026 - 04:39:04 EST
The snd_sof_volume_put() and snd_sof_switch_put() pass the user values
to the IPC put handlers without a range check. The switch handlers
store any value and send it to the firmware, so on IPC3 writing 2 or -1
to a switch reads back as 2 or 4294967295. The volume handlers convert
the value to u32 and clamp it to the end of the volume table. Writing -1
sets the maximum volume, and on 64-bit writing LONG_MIN sets the
minimum, both without an error.
Return -EINVAL for values outside the range the info callbacks report,
as snd_soc_put_volsw() does. This fixes the write_invalid failures in
mixer-test, and the event_spurious failures caused by the events those
writes generated.
Fixes: c3078f539704 ("ASoC: SOF: Add Sound Open Firmware KControl support")
Signed-off-by: HyeongJun An <sammiee5311@xxxxxxxxx>
---
sound/soc/sof/control.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/sound/soc/sof/control.c b/sound/soc/sof/control.c
index 136e2ce15201..dcf101f7e1d5 100644
--- a/sound/soc/sof/control.c
+++ b/sound/soc/sof/control.c
@@ -26,6 +26,24 @@ static int sof_mixer_max(const struct soc_mixer_control *sm)
return max;
}
+/* the IPC put handlers do not check the range */
+static int sof_mixer_check_values(const struct soc_mixer_control *sm,
+ const struct snd_sof_control *scontrol,
+ const struct snd_ctl_elem_value *ucontrol)
+{
+ int max = sof_mixer_max(sm);
+ unsigned int i;
+
+ for (i = 0; i < scontrol->num_channels; i++) {
+ long val = ucontrol->value.integer.value[i];
+
+ if (val < 0 || val > max)
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
int snd_sof_volume_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@@ -49,6 +67,11 @@ int snd_sof_volume_put(struct snd_kcontrol *kcontrol,
struct snd_soc_component *scomp = scontrol->scomp;
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
const struct sof_ipc_tplg_ops *tplg_ops = sof_ipc_get_ops(sdev, tplg);
+ int ret;
+
+ ret = sof_mixer_check_values(sm, scontrol, ucontrol);
+ if (ret)
+ return ret;
if (tplg_ops && tplg_ops->control && tplg_ops->control->volume_put)
return tplg_ops->control->volume_put(scontrol, ucontrol);
@@ -97,6 +120,11 @@ int snd_sof_switch_put(struct snd_kcontrol *kcontrol,
struct snd_soc_component *scomp = scontrol->scomp;
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
const struct sof_ipc_tplg_ops *tplg_ops = sof_ipc_get_ops(sdev, tplg);
+ int ret;
+
+ ret = sof_mixer_check_values(sm, scontrol, ucontrol);
+ if (ret)
+ return ret;
if (tplg_ops && tplg_ops->control && tplg_ops->control->switch_put)
return tplg_ops->control->switch_put(scontrol, ucontrol);
--
2.43.0