Skip to contentSkip to conversation

ASoC: Intel: Skylake: fix possible memory leak in skl_codec_device_init()

PATCH In review Yang Yingliang 3 participants 4 messages Oct 21, 2022 – Nov 2, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 ASoC: Intel: Skylake: fix possible memory leak in skl_codec_device_init()

If snd_hdac_device_register() fails, 'codec' and name allocated in dev_set_name() called in snd_hdac_device_init() are leaked. Fix this by calling put_device(), so they can be freed in snd_hda_codec_dev_release() and kobject_cleanup().

Fixes e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines")
Fixes dfe66a18780d ("ALSA: hdac_ext: add extended HDA bus")

---
v2 -> v3:
add suggest tag

v1 -> v2:
remove skl_codec_device_exit() and use snd_hda_codec_dev_release() to fix leak

---
 sound/soc/intel/skylake/skl.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
sound/soc/intel/skylake/skl.c +1 -7
index bbba2df33aaf..3312b57e3c0c 100644
@@ -689,11 +689,6 @@ static void load_codec_module(struct hda_codec *codec)
 
 #endif /* CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC */
 
-static void skl_codec_device_exit(struct device *dev)
-{
-	snd_hdac_device_exit(dev_to_hdac_dev(dev));
-}
-
 static struct hda_codec *skl_codec_device_init(struct hdac_bus *bus, int addr)
 {
 	struct hda_codec *codec;
@@ -706,12 +701,11 @@ static struct hda_codec *skl_codec_device_init(struct hdac_bus *bus, int addr)
 	}
 
 	codec->core.type = HDA_DEV_ASOC;
-	codec->core.dev.release = skl_codec_device_exit;
 
 	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);
 	}
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH v3 2/2 ASoC: SOF: Intel: hda-codec: fix possible memory leak in hda_codec_device_init()

If snd_hdac_device_register() fails, 'codec' and name allocated in dev_set_name() called in snd_hdac_device_init() are leaked. Fix this by calling put_device(), so they can be freed in snd_hda_codec_dev_release() and kobject_cleanup().

Fixes 829c67319806 ("ASoC: SOF: Intel: Introduce HDA codec init and exit routines")
Fixes dfe66a18780d ("ALSA: hdac_ext: add extended HDA bus")

---
v2 -> v3:
add sugesst tag and review tag.

v1 -> v2:
remove hda_codec_device_exit() and use snd_hda_codec_dev_release() to fix leak

---
 sound/soc/sof/intel/hda-codec.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
sound/soc/sof/intel/hda-codec.c +1 -7
index 1e9afc48394c..f2ec2a6c2e0f 100644
@@ -109,11 +109,6 @@ EXPORT_SYMBOL_NS(hda_codec_jack_check, SND_SOC_SOF_HDA_AUDIO_CODEC);
 #define is_generic_config(x)	0
 #endif
 
-static void hda_codec_device_exit(struct device *dev)
-{
-	snd_hdac_device_exit(dev_to_hdac_dev(dev));
-}
-
 static struct hda_codec *hda_codec_device_init(struct hdac_bus *bus, int addr, int type)
 {
 	struct hda_codec *codec;
@@ -126,12 +121,11 @@ static struct hda_codec *hda_codec_device_init(struct hdac_bus *bus, int addr, i
 	}
 
 	codec->core.type = type;
-	codec->core.dev.release = hda_codec_device_exit;
 
 	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);
 	}
 
Signature · 1 line
2.25.1
maintainer Reviewed-by on v3 1/2
#2 lore raw
In reply to Yang Yingliang
Quoted 9 lines · Yang Yingliang

If snd_hdac_device_register() fails, 'codec' and name allocated in dev_set_name() called in snd_hdac_device_init() are leaked. Fix this by calling put_device(), so they can be freed in snd_hda_codec_dev_release() and kobject_cleanup().

Fixes e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines")
Fixes dfe66a18780d ("ALSA: hdac_ext: add extended HDA bus")

Thanks for your report and the fix. For the series:

maintainer
#3 lore raw
In reply to Yang Yingliang
Quoted 6 lines · Yang Yingliang

If snd_hdac_device_register() fails, 'codec' and name allocated in dev_set_name() called in snd_hdac_device_init() are leaked. Fix this by calling put_device(), so they can be freed in snd_hda_codec_dev_release() and kobject_cleanup().

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: Intel: Skylake: fix possible memory leak in skl_codec_device_init()

      commit: 0aa60ddc219e7bac967605ecbe46f2f6cd24ee9c
[2/2] ASoC: SOF: Intel: hda-codec: fix possible memory leak in hda_codec_device_init()
      commit: 0d183c27ed30a3b21a8fbd6db4d1d7779faf1503

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark