* [PATCH] ALSA: ac97: Fix double free of ac97_codec_device
@ 2019-07-23 7:44 Ding Xiang
2019-07-23 12:15 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Ding Xiang @ 2019-07-23 7:44 UTC (permalink / raw)
To: perex, tiwai; +Cc: alsa-devel, linux-kernel
put_device will call ac97_codec_release to free
ac97_codec_device and other resources, so remove the kfree
and other redundant code.
Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
---
sound/ac97/bus.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c
index 7b977b7..7985dd8 100644
--- a/sound/ac97/bus.c
+++ b/sound/ac97/bus.c
@@ -122,17 +122,12 @@ static int ac97_codec_add(struct ac97_controller *ac97_ctrl, int idx,
vendor_id);
ret = device_add(&codec->dev);
- if (ret)
- goto err_free_codec;
+ if (ret) {
+ put_device(&codec->dev);
+ return ret;
+ }
return 0;
-err_free_codec:
- of_node_put(codec->dev.of_node);
- put_device(&codec->dev);
- kfree(codec);
- ac97_ctrl->codecs[idx] = NULL;
-
- return ret;
}
unsigned int snd_ac97_bus_scan_one(struct ac97_controller *adrv,
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ALSA: ac97: Fix double free of ac97_codec_device
2019-07-23 7:44 [PATCH] ALSA: ac97: Fix double free of ac97_codec_device Ding Xiang
@ 2019-07-23 12:15 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2019-07-23 12:15 UTC (permalink / raw)
To: Ding Xiang; +Cc: perex, alsa-devel, linux-kernel
On Tue, 23 Jul 2019 09:44:41 +0200,
Ding Xiang wrote:
>
> put_device will call ac97_codec_release to free
> ac97_codec_device and other resources, so remove the kfree
> and other redundant code.
>
> Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ALSA: ac97: Fix double free of ac97_codec_device
@ 2019-07-23 12:15 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2019-07-23 12:15 UTC (permalink / raw)
To: Ding Xiang; +Cc: perex, alsa-devel, linux-kernel
On Tue, 23 Jul 2019 09:44:41 +0200,
Ding Xiang wrote:
>
> put_device will call ac97_codec_release to free
> ac97_codec_device and other resources, so remove the kfree
> and other redundant code.
>
> Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-23 12:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-23 7:44 [PATCH] ALSA: ac97: Fix double free of ac97_codec_device Ding Xiang
2019-07-23 12:15 ` Takashi Iwai
2019-07-23 12:15 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.