linux-kernel - Re: [PATCH] ALSA: fm801: add error handling for snd_ctl

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 for Android: free password hash cracker in your pocket

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

Message-ID: <520e80a8b8de0f532e8dd3ee15af9efbc748dd9a.camel@linux.intel.com>
Date:   Mon, 11 Jun 2018 11:49:56 +0300
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     jiazhouyang09@...il.com,
        Émeric MASCHINO <emeric.maschino@...il.com>
Cc:     Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.com>,
        Bhumika Goyal <bhumirks@...il.com>,
        alsa-devel@...a-project.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ALSA: fm801: add error handling for snd_ctl_add

On Mon, 2018-06-11 at 16:04 +0800, jiazhouyang09@...il.com wrote:
> When snd_ctl_add fails, the lack of error-handling code may
> cause unexpected results.
> 
> This patch adds error-handling code after calling snd_ctl_add.
> 

Acked-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>

Though I can't test this (I have FM-only card). Last person who would
able to test was Émeric (Cc'ed).

> Signed-off-by: Zhouyang Jia <jiazhouyang09@...il.com>
> ---
>  sound/pci/fm801.c | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
> index 73a67bc..e3fb9c6 100644
> --- a/sound/pci/fm801.c
> +++ b/sound/pci/fm801.c
> @@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip)
>  		if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97,
> &chip->ac97_sec)) < 0)
>  			return err;
>  	}
> -	for (i = 0; i < FM801_CONTROLS; i++)
> -		snd_ctl_add(chip->card,
> snd_ctl_new1(&snd_fm801_controls[i], chip));
> +	for (i = 0; i < FM801_CONTROLS; i++) {
> +		err = snd_ctl_add(chip->card,
> +			snd_ctl_new1(&snd_fm801_controls[i], chip));
> +		if (err < 0)
> +			return err;
> +	}
>  	if (chip->multichannel) {
> -		for (i = 0; i < FM801_CONTROLS_MULTI; i++)
> -			snd_ctl_add(chip->card,
> snd_ctl_new1(&snd_fm801_controls_multi[i], chip));
> +		for (i = 0; i < FM801_CONTROLS_MULTI; i++) {
> +			err = snd_ctl_add(chip->card,
> +				snd_ctl_new1(&snd_fm801_controls_mult
> i[i], chip));
> +			if (err < 0)
> +				return err;
> +		}
>  	}
>  	return 0;
>  }

-- 
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Intel Finland Oy