mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Péter Ujfalusi" <peter.ujfalusi@linux.intel.com>
To: HyeongJun An <sammiee5311@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
	Bard Liao <yung-chuan.liao@linux.intel.com>,
	Daniel Baluta <daniel.baluta@nxp.com>,
	Kai Vehmanen <kai.vehmanen@linux.intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	sound-open-firmware@alsa-project.org,
	linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ASoC: SOF: control: Reject out of range volume and switch values
Date: Tue, 17 Nov 2026 15:29:42 +0200	[thread overview]
Message-ID: <a73265bb-5644-414b-ad4a-2c71b50626a8@linux.intel.com> (raw)
In-Reply-To: <20261114021730.2349347-1-sammiee5311@gmail.com>



On 14/11/2026 04:17, HyeongJun An wrote:
> 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 reported by the info
> callback, 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@gmail.com>

> ---
> Tested on a Dell Latitude 9420 (Tiger Lake, SOF IPC3): the out of range
> writes now fail with -EINVAL, in range writes still work, and the 9
> mixer-test failures on the SOF controls are gone. IPC4 was not tested.
> Its put handlers store the value the same way and now go through the
> same check.
> 
> Prepared with Claude Code (Claude Opus 5.5). Tested on x86_64.
> 
>  sound/soc/sof/control.c | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
> 
> diff --git a/sound/soc/sof/control.c b/sound/soc/sof/control.c
> index 74d997a4f620..b6497e50505b 100644
> --- a/sound/soc/sof/control.c
> +++ b/sound/soc/sof/control.c
> @@ -30,6 +30,30 @@ int snd_sof_volume_get(struct snd_kcontrol *kcontrol,
>  	return 0;
>  }
>  
> +/*
> + * Reject values outside the range the info callback reports, as
> + * snd_soc_put_volsw() does. The IPC put handlers do not check the range.
> + */
> +static int sof_mixer_check_values(struct soc_mixer_control *sm,
> +				  struct snd_sof_control *scontrol,
> +				  struct snd_ctl_elem_value *ucontrol)
> +{
> +	long max = sm->max - sm->min;
> +	unsigned int i;
> +
> +	if (sm->platform_max && sm->platform_max < max)
> +		max = sm->platform_max;

the volume_info() reports max to user space:
sm->platform_max - sm->min;

If for example: min=10, max=100, platform_max=80

here we accept up to 80, and report 70 via info for max, which is wrong.

Can you update the patch and align the info() call to do similar
calculation?

int max = sm->max - sm->min;

if (sm->platform_max && sm->platform_max < max)
    max = sm->platform_max;

uinfo->value.integer.min = 0;
uinfo->value.integer.max = max;

We don't have any volume control with min other than 0, but if we would
have, the put function disregard those and write the raw value.
Note to self to fix this.


> +
> +	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_put(struct snd_kcontrol *kcontrol,
>  		       struct snd_ctl_elem_value *ucontrol)
>  {
> @@ -38,6 +62,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);
> @@ -90,6 +119,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);

-- 
Péter


      reply	other threads:[~2026-11-17 13:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-14  2:17 HyeongJun An
2026-11-17 13:29 ` Péter Ujfalusi [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a73265bb-5644-414b-ad4a-2c71b50626a8@linux.intel.com \
    --to=peter.ujfalusi@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=daniel.baluta@nxp.com \
    --cc=kai.vehmanen@linux.intel.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=pierre-louis.bossart@linux.dev \
    --cc=sammiee5311@gmail.com \
    --cc=sound-open-firmware@alsa-project.org \
    --cc=tiwai@suse.com \
    --cc=yung-chuan.liao@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®