ALSA: echoaudio: Fix potential Oops in snd_echo_resume()

dinghaoliu · gregkh · commit 9a1b7ced0fd9 · 2020-08-21T11:05:38.000+02:00
[ Upstream commit 5a25de6 ] 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: 47b5d02 ("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>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -2216,7 +2216,6 @@ static int snd_echo_resume(struct device *dev)`
`2216`	`2216`	`if (err < 0) {`
`2217`	`2217`	`kfree(commpage_bak);`
`2218`	`2218`	`dev_err(dev, "resume init_hw err=%d\n", err);`
`2219`		`- snd_echo_free(chip);`
`2220`	`2219`	`return err;`
`2221`	`2220`	`}`
`2222`	`2221`
`@@ -2243,7 +2242,6 @@ static int snd_echo_resume(struct device *dev)`
`2243`	`2242`	`if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,`
`2244`	`2243`	`KBUILD_MODNAME, chip)) {`
`2245`	`2244`	`dev_err(chip->card->dev, "cannot grab irq\n");`
`2246`		`- snd_echo_free(chip);`
`2247`	`2245`	`return -EBUSY;`
`2248`	`2246`	`}`
`2249`	`2247`	`chip->irq = pci->irq;`