Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ca71b80 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Greg Kroah-Hartman
Browse files

ASoC: topology: fix tlvs in error handling for widget_dmixer 



commit 8edac489e7c3fce44208373bb3e7b5835a672c66 upstream.

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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200707203749.113883-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4fd00dd

sound/soc/soc-topology.c

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

		}

	}
@@ -1402,6 +1401,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);