diff options
author | Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-08-13 15:46:30 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-21 11:05:38 +0200 |
commit | 9a1b7ced0fd9305d25708ff7fd9d7d4fb794f7a1 (patch) | |
tree | fbda628033c2de83706bd82391c86e0c7f043b4c /sound/pci | |
parent | 59547851489e5168b7291eac5ecc5bb24a71d7f5 (diff) | |
download | linux-stable-9a1b7ced0fd9305d25708ff7fd9d7d4fb794f7a1.tar.gz linux-stable-9a1b7ced0fd9305d25708ff7fd9d7d4fb794f7a1.tar.bz2 linux-stable-9a1b7ced0fd9305d25708ff7fd9d7d4fb794f7a1.zip |
ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
[ 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>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 3ef2b27ebbe8..f32c55ffffc7 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2216,7 +2216,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; } @@ -2243,7 +2242,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; |