Unverified Commit 76d27036 authored Dec 09, 2019 by Dragos Tarcatu Committed by Mark Brown Dec 10, 2019

ASoC: topology: Check return value for snd_soc_add_dai_link()



snd_soc_add_dai_link() might fail. This situation occurs for
instance in a very specific use case where a PCM device and a
Back End DAI link are given identical names in the topology.
When this happens, soc_new_pcm_runtime() fails and then
snd_soc_add_dai_link() returns -ENOMEM when called from
soc_tplg_fe_link_create(). Because of that, the link will not
get added into the card list, so any attempt to remove it later
ends up in a panic.

Fix that by checking the return status and free the memory in case
of an error.

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>
Link: https://lore.kernel.org/r/20191210003939.15752-2-pierre-louis.bossart@linux.intel.com


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

parent 9c9b6520

sound/soc/soc-topology.c

+13 −6

Original line number	Diff line number	Diff line
		@@ -1933,11 +1933,13 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
		ret = soc_tplg_dai_link_load(tplg, link, NULL);
		if (ret < 0) {
		dev_err(tplg->comp->dev, "ASoC: FE link loading failed\n");
		kfree(link->name);
		kfree(link->stream_name);
		kfree(link->cpus->dai_name);
		kfree(link);
		return ret;
		goto err;
		}

		ret = snd_soc_add_dai_link(tplg->comp->card, link);
		if (ret < 0) {
		dev_err(tplg->comp->dev, "ASoC: adding FE link failed\n");
		goto err;
		}

		link->dobj.index = tplg->index;
		@@ -1945,8 +1947,13 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
		link->dobj.type = SND_SOC_DOBJ_DAI_LINK;
		list_add(&link->dobj.list, &tplg->comp->dobj_list);

		snd_soc_add_dai_link(tplg->comp->card, link);
		return 0;
		err:
		kfree(link->name);
		kfree(link->stream_name);
		kfree(link->cpus->dai_name);
		kfree(link);
		return ret;
		}

		/* create a FE DAI and DAI link from the PCM object */

Admin message