| Message ID | 20221020034752.2392283-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASOC: SOF: Intel: hda-codec: fix possible memory leak in hda_codec_device_init() | expand |
On Thu, Oct 20, 2022 at 11:47:52AM +0800, Yang Yingliang wrote: > If snd_hdac_device_register() fails, 'codec' is leaked, free it > in snd_hdac_device_exit(). And device_initialize() is called in > snd_hdac_device_init(), it should call put_device() to give up > reference or the name allocated in dev_set_name() is leaked. > The snd_hdac_device_exit() will be called in dev->release(). This doesn't apply against current code, please check and resend.
Hi, On 2022/11/2 2:29, Mark Brown wrote: > On Thu, Oct 20, 2022 at 11:47:52AM +0800, Yang Yingliang wrote: >> If snd_hdac_device_register() fails, 'codec' is leaked, free it in >> snd_hdac_device_exit(). And device_initialize() is called in >> snd_hdac_device_init(), it should call put_device() to give up >> reference or the name allocated in dev_set_name() is leaked. The >> snd_hdac_device_exit() will be called in dev->release(). > This doesn't apply against current code, please check and resend. This is v1, the v2 has already been merged. https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?h=for-6.1&id=e9441675edc1bb8dbfadacf68aafacca60d65a25 Thanks, Yang
diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 1e9afc48394c..f8cbcc25154b 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -111,7 +111,11 @@ EXPORT_SYMBOL_NS(hda_codec_jack_check, SND_SOC_SOF_HDA_AUDIO_CODEC); static void hda_codec_device_exit(struct device *dev) { - snd_hdac_device_exit(dev_to_hdac_dev(dev)); + struct hdac_device *hdac_dev = dev_to_hdac_dev(dev); + struct hda_codec *codec = container_of(hdac_dev, struct hda_codec, core); + + snd_hdac_device_exit(hdac_dev); + kfree(codec); } static struct hda_codec *hda_codec_device_init(struct hdac_bus *bus, int addr, int type) @@ -131,7 +135,7 @@ static struct hda_codec *hda_codec_device_init(struct hdac_bus *bus, int addr, i ret = snd_hdac_device_register(&codec->core); if (ret) { dev_err(bus->dev, "failed to register hdac device\n"); - snd_hdac_device_exit(&codec->core); + put_device(&codec->core.dev); return ERR_PTR(ret); }
If snd_hdac_device_register() fails, 'codec' is leaked, free it in snd_hdac_device_exit(). And device_initialize() is called in snd_hdac_device_init(), it should call put_device() to give up reference or the name allocated in dev_set_name() is leaked. The snd_hdac_device_exit() will be called in dev->release(). Fixes: 829c67319806 ("ASoC: SOF: Intel: Introduce HDA codec init and exit routines") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- sound/soc/sof/intel/hda-codec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)