* [PATCH] [v2] ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
@ 2020-08-13 7:46 Dinghao Liu
2020-08-13 9:22 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Dinghao Liu @ 2020-08-13 7:46 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Jaroslav Kysela, Takashi Iwai, Mark Hills, Takashi Sakamoto,
Pierre-Louis Bossart, YueHaibing, Giuliano Pochini, alsa-devel,
linux-kernel
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>
---
Changelog:
v2: - Remove snd_echo_free() calls in all error paths.
---
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 6aeb99aa2414..868f1dcd27d6 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -2213,7 +2213,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;
}
@@ -2240,7 +2239,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.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [v2] ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
2020-08-13 7:46 [PATCH] [v2] ALSA: echoaudio: Fix potential Oops in snd_echo_resume() Dinghao Liu
@ 2020-08-13 9:22 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2020-08-13 9:22 UTC (permalink / raw)
To: Dinghao Liu
Cc: kjlu, Jaroslav Kysela, Takashi Iwai, Mark Hills,
Takashi Sakamoto, Pierre-Louis Bossart, YueHaibing,
Giuliano Pochini, alsa-devel, linux-kernel
On Thu, 13 Aug 2020 09:46:30 +0200,
Dinghao Liu wrote:
>
> 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>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-13 9:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-13 7:46 [PATCH] [v2] ALSA: echoaudio: Fix potential Oops in snd_echo_resume() Dinghao Liu
2020-08-13 9:22 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).