Unverified Commit 0e213813 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files

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: e4746d94 ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Suggested-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20221020105937.1448951-1-yangyingliang@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 05de5cf6

sound/soc/intel/skylake/skl.c

+1 −7
Original line number Diff line number Diff line
@@ -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);

	}