Unverified Commit 72b46612 authored Dec 17, 2019 by Dragos Tarcatu Committed by Mark Brown Dec 18, 2019

ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime()

remove_link() is currently calling snd_soc_remove_pcm_runtime() after
it has already freed the memory for the link name. But this is later
read from snd_soc_get_pcm_runtime() causing a KASAN use-after-free
warning. Reorder the cleanups to fix this issue.

Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Dragos Tarcatu <dragos_tarcatu@mentor.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20191218000518.5830-4-pierre-louis.bossart@linux.intel.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent fb522dbb

sound/soc/soc-topology.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -548,14 +548,14 @@ static void remove_link(struct snd_soc_component *comp,
		if (dobj->ops && dobj->ops->link_unload)
		dobj->ops->link_unload(comp, dobj);

		kfree(link->name);
		kfree(link->stream_name);
		kfree(link->cpus->dai_name);

		list_del(&dobj->list);

		snd_soc_remove_pcm_runtime(comp->card,
		snd_soc_get_pcm_runtime(comp->card, link));

		kfree(link->name);
		kfree(link->stream_name);
		kfree(link->cpus->dai_name);
		kfree(link);
		}