linux-kernel - Re: [PATCH 4.9 34/48] ASoC: ops: Reject out of bounds values in snd_soc_put_volsw

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220603100613.GA26825@duo.ucw.cz>
Date:   Fri, 3 Jun 2022 12:06:13 +0200
From:   Pavel Machek <pavel@....cz>
To:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        theflamefire89@...il.com
Cc:     linux-kernel@...r.kernel.org, stable@...r.kernel.org,
        Mark Brown <broonie@...nel.org>
Subject: Re: [PATCH 4.9 34/48] ASoC: ops: Reject out of bounds values in
 snd_soc_put_volsw_sx()

Hi!

> commit 4f1e50d6a9cf9c1b8c859d449b5031cacfa8404e upstream.
> 
> We don't currently validate that the values being set are within the range
> we advertised to userspace as being valid, do so and reject any values
> that are out of range.

We are getting reports that this commit breaks audio on some
phones... and indeed it looks like "+ min" is missing in first condition:

https://github.com/baunilla/android_kernel_xiaomi_rosy/commit/969b9d366c1e9564e173aea325ec544dcd7804ff

	val = ucontrol->value.integer.value[0];
-	if (mc->platform_max && val > mc->platform_max)
+	if (mc->platform_max && ((int)val + min) > mc->platform_max)
		return -EINVAL;

What needs to be done to get this fixed?

Best regards,
								Pavel

Reported-by: <theflamefire89@...il.com>

> Signed-off-by: Mark Brown <broonie@...nel.org>
> Cc: stable@...r.kernel.org
> Link: https://lore.kernel.org/r/20220124153253.3548853-3-broonie@kernel.org
> Signed-off-by: Mark Brown <broonie@...nel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> ---
>  sound/soc/soc-ops.c |    9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> --- a/sound/soc/soc-ops.c
> +++ b/sound/soc/soc-ops.c
> @@ -441,8 +441,15 @@ int snd_soc_put_volsw_sx(struct snd_kcon
>  	int err = 0;
>  	unsigned int val, val_mask, val2 = 0;
>  
> +	val = ucontrol->value.integer.value[0];
> +	if (mc->platform_max && val > mc->platform_max)
> +		return -EINVAL;
> +	if (val > max - min)
> +		return -EINVAL;
> +	if (val < 0)
> +		return -EINVAL;
>  	val_mask = mask << shift;
> -	val = (ucontrol->value.integer.value[0] + min) & mask;
> +	val = (val + min) & mask;
>  	val = val << shift;
>  
>  	err = snd_soc_component_update_bits(component, reg, val_mask, val);
> 

-- 
People of Russia, stop Putin before his war on Ukraine escalates.

Download attachment "signature.asc" of type "application/pgp-signature" (196 bytes)