Unverified Commit 8edac489 authored Jul 07, 2020 by Pierre-Louis Bossart Committed by Mark Brown Jul 08, 2020

ASoC: topology: fix tlvs in error handling for widget_dmixer

we need to free all allocated tlvs, not just the one allocated in
the loop before releasing kcontrols - other the tlvs references will
leak.

Fixes: 9f90af3a ('ASoC: topology: Consolidate and fix asoc_tplg_dapm_widget_*_create flow')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200707203749.113883-3-pierre-louis.bossart@linux.intel.com

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

parent 6f0307df

sound/soc/soc-topology.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1371,7 +1371,6 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create(
		if (err < 0) {
		dev_err(tplg->dev, "ASoC: failed to init %s\n",
		mc->hdr.name);
		soc_tplg_free_tlv(tplg, &kc[i]);
		goto err_sm;
		}
		}
		@@ -1379,6 +1378,7 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create(

		err_sm:
		for (; i >= 0; i--) {
		soc_tplg_free_tlv(tplg, &kc[i]);
		sm = (struct soc_mixer_control *)kc[i].private_value;
		kfree(sm);
		kfree(kc[i].name);