Commit 380b78e3 authored by Dinghao Liu's avatar Dinghao Liu Committed by Kelsey Skunberg

ALSA: echoaudio: Fix potential Oops in snd_echo_resume()

BugLink: https://bugs.launchpad.net/bugs/1892822

[ Upstream commit 5a25de6d ]

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: 47b5d028 ("ALSA: Echoaudio - Add suspend support #2")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Link: https://lore.kernel.org/r/20200813074632.17022-1-dinghao.liu@zju.edu.cnSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent e50db4e0
...@@ -2215,7 +2215,6 @@ static int snd_echo_resume(struct device *dev) ...@@ -2215,7 +2215,6 @@ static int snd_echo_resume(struct device *dev)
if (err < 0) { if (err < 0) {
kfree(commpage_bak); kfree(commpage_bak);
dev_err(dev, "resume init_hw err=%d\n", err); dev_err(dev, "resume init_hw err=%d\n", err);
snd_echo_free(chip);
return err; return err;
} }
...@@ -2242,7 +2241,6 @@ static int snd_echo_resume(struct device *dev) ...@@ -2242,7 +2241,6 @@ static int snd_echo_resume(struct device *dev)
if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
KBUILD_MODNAME, chip)) { KBUILD_MODNAME, chip)) {
dev_err(chip->card->dev, "cannot grab irq\n"); dev_err(chip->card->dev, "cannot grab irq\n");
snd_echo_free(chip);
return -EBUSY; return -EBUSY;
} }
chip->irq = pci->irq; chip->irq = pci->irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment