lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 146/149] ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 5a25de6df789cc805a9b8ba7ab5deef5067af47e ]

    Freeing chip on error may lead to an Oops at the next time
    the system goes to resume. Fix this by removing all
    snd_echo_free() calls on error.

    Fixes: 47b5d028fdce8 ("ALSA: Echoaudio - Add suspend support #2")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Link: https://lore.kernel.org/r/20200813074632.17022-1-dinghao.liu@zju.edu.cn
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/pci/echoaudio/echoaudio.c | 2 --
    1 file changed, 2 deletions(-)

    diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
    index d73ee11a32bd0..db14ee43e461a 100644
    --- a/sound/pci/echoaudio/echoaudio.c
    +++ b/sound/pci/echoaudio/echoaudio.c
    @@ -2215,7 +2215,6 @@ static int snd_echo_resume(struct device *dev)
    if (err < 0) {
    kfree(commpage_bak);
    dev_err(dev, "resume init_hw err=%d\n", err);
    - snd_echo_free(chip);
    return err;
    }

    @@ -2242,7 +2241,6 @@ static int snd_echo_resume(struct device *dev)
    if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
    KBUILD_MODNAME, chip)) {
    dev_err(chip->card->dev, "cannot grab irq\n");
    - snd_echo_free(chip);
    return -EBUSY;
    }
    chip->irq = pci->irq;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 12:24    [W:7.185 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site