Re: [PATCH 159/190] Revert "ALSA: gus: add a check of the status of snd_ctl_add"

Takashi Iwai
2021-04-21T16:28:11Z

On Wed, 21 Apr 2021 15:00:34 +0200,
Greg Kroah-Hartman wrote:
>
> This reverts commit 0f25e000cb4398081748e54f62a902098aa79ec1.
>
> Commits from @umn.edu addresses have been found to be submitted in "bad
> faith" to try to test the kernel community's ability to review "known
> malicious" changes. The result of these submissions can be found in a
> paper published at the 42nd IEEE Symposium on Security and Privacy
> entitled, "Open Source Insecurity: Stealthily Introducing
> Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
> of Minnesota) and Kangjie Lu (University of Minnesota).
>
> Because of this, all submissions from this group must be reverted from
> the kernel tree and will need to be re-reviewed again to determine if
> they actually are a valid fix. Until that work is complete, remove this
> change to ensure that no problems are being introduced into the
> codebase.
>
> Cc: Kangjie Lu <kjlu@umn.edu>
> Cc: Takashi Iwai <tiwai@suse.de>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

This code change simply adds an error message print out, so it doesn't
actually fix anything, per se (although the code change itself is
fine). Feel free to revert.

thanks,

Takashi

> ---
> sound/isa/gus/gus_main.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
> index afc088f0377c..b7518122a10d 100644
> --- a/sound/isa/gus/gus_main.c
> +++ b/sound/isa/gus/gus_main.c
> @@ -77,17 +77,8 @@ static const struct snd_kcontrol_new snd_gus_joystick_control = {
>
> static void snd_gus_init_control(struct snd_gus_card *gus)
> {
> - int ret;
> -
> - if (!gus->ace_flag) {
> - ret =
> - snd_ctl_add(gus->card,
> - snd_ctl_new1(&snd_gus_joystick_control,
> - gus));
> - if (ret)
> - snd_printk(KERN_ERR "gus: snd_ctl_add failed: %d\n",
> - ret);
> - }
> + if (!gus->ace_flag)
> + snd_ctl_add(gus->card, snd_ctl_new1(&snd_gus_joystick_control, gus));
> }
>
> /*
> --
> 2.31.1
>