linux-kernel - Re: [PATCH] ASoC: fsl-asoc-card: Fix jack

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] [day] [month] [year] [list]

Message-ID: <951b1a57-99d7-caaf-2bf4-7a308a6ff3a8@csgroup.eu>
Date:   Mon, 21 Mar 2022 06:44:54 +0000
From:   Christophe Leroy <christophe.leroy@...roup.eu>
To:     Meng Tang <tangmeng@...ontech.com>,
        "nicoleotsuka@...il.com" <nicoleotsuka@...il.com>,
        "Xiubo.Lee@...il.com" <Xiubo.Lee@...il.com>,
        "festevam@...il.com" <festevam@...il.com>,
        "shengjiu.wang@...il.com" <shengjiu.wang@...il.com>,
        "lgirdwood@...il.com" <lgirdwood@...il.com>,
        "broonie@...nel.org" <broonie@...nel.org>,
        "perex@...ex.cz" <perex@...ex.cz>,
        "tiwai@...e.com" <tiwai@...e.com>
CC:     "alsa-devel@...a-project.org" <alsa-devel@...a-project.org>,
        "linuxppc-dev@...ts.ozlabs.org" <linuxppc-dev@...ts.ozlabs.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] ASoC: fsl-asoc-card: Fix jack_event() always return 0



Le 18/03/2022 à 10:35, Meng Tang a écrit :
> Today, hp_jack_event and mic_jack_event always return 0. However,
> snd_soc_dapm_disable_pin and snd_soc_dapm_enable_pin may return a
> non-zero value, this will cause the user who calling hp_jack_event
> and mic_jack_event don't know whether the operation was really
> successfully.
> 
> This patch corrects the behavior by properly returning 1 when the
> value gets updated.
> 
> Signed-off-by: Meng Tang <tangmeng@...ontech.com>
> ---
>   sound/soc/fsl/fsl-asoc-card.c | 16 ++++++++++------
>   1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
> index 370bc790c6ba..f2641c2cb047 100644
> --- a/sound/soc/fsl/fsl-asoc-card.c
> +++ b/sound/soc/fsl/fsl-asoc-card.c
> @@ -457,16 +457,18 @@ static int fsl_asoc_card_audmux_init(struct device_node *np,
>   static int hp_jack_event(struct notifier_block *nb, unsigned long event,
>   			 void *data)
>   {
> +	int ret;
> +

You don't need that new local var. There are coccinelle scripts that 
track those unnecessary intermediates so don't add a new one.

>   	struct snd_soc_jack *jack = (struct snd_soc_jack *)data;
>   	struct snd_soc_dapm_context *dapm = &jack->card->dapm;
>   
>   	if (event & SND_JACK_HEADPHONE)
>   		/* Disable speaker if headphone is plugged in */
> -		snd_soc_dapm_disable_pin(dapm, "Ext Spk");
> +		ret = snd_soc_dapm_disable_pin(dapm, "Ext Spk");

Should be
		return snd_soc_dapm_disable_pin(dapm, "Ext Spk");

>   	else
> -		snd_soc_dapm_enable_pin(dapm, "Ext Spk");
> +		ret = snd_soc_dapm_enable_pin(dapm, "Ext Spk");

and

		return snd_soc_dapm_enable_pin(dapm, "Ext Spk");

>   
> -	return 0;
> +	return ret;

And completely drop that.

>   }
>   
>   static struct notifier_block hp_jack_nb = {
> @@ -476,16 +478,18 @@ static struct notifier_block hp_jack_nb = {
>   static int mic_jack_event(struct notifier_block *nb, unsigned long event,
>   			  void *data)
>   {
> +	int ret;
> +

And do exactly the same here.

>   	struct snd_soc_jack *jack = (struct snd_soc_jack *)data;
>   	struct snd_soc_dapm_context *dapm = &jack->card->dapm;
>   
>   	if (event & SND_JACK_MICROPHONE)
>   		/* Disable dmic if microphone is plugged in */
> -		snd_soc_dapm_disable_pin(dapm, "DMIC");
> +		ret = snd_soc_dapm_disable_pin(dapm, "DMIC");
>   	else
> -		snd_soc_dapm_enable_pin(dapm, "DMIC");
> +		ret = snd_soc_dapm_enable_pin(dapm, "DMIC");
>   
> -	return 0;
> +	return ret;
>   }
>   
>   static struct notifier_block mic_jack_nb = {