Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 306df54b authored by Dinghao Liu's avatar Dinghao Liu Committed by Greg Kroah-Hartman
Browse files

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: 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.cn


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8bc48c35

sound/pci/echoaudio/echoaudio.c

+0 −2
Original line number Diff line number Diff line
@@ -2198,7 +2198,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;

	}
@@ -2225,7 +2224,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;