lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 024/336] ALSA: fm801: add error handling for snd_ctl_add
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Zhouyang Jia <jiazhouyang09@gmail.com>

    [ Upstream commit ef1ffbe7889e99f5b5cccb41c89e5c94f50f3218 ]

    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.

    Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
    Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/pci/fm801.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    --- a/sound/pci/fm801.c
    +++ b/sound/pci/fm801.c
    @@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801
    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_multi[i], chip));
    + if (err < 0)
    + return err;
    + }
    }
    return 0;
    }

    \
     
     \ /
      Last update: 2018-08-01 19:39    [W:6.498 / U:0.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site