Unverified Commit 9c363532 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: topology: Correct error handling in soc_tplg_dapm_widget_create() 



Academic correction of error handling:
In case the allocation of kc or kcontrol_type fails the correct label to
jump is hdr_err since the template.sname has been also allocated at this
point.

Fixes: d29d41e2 ("ASoC: topology: Add support for multiple kcontrol types to a widget")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220331114957.519-1-peter.ujfalusi@linux.intel.com


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

sound/soc/soc-topology.c

+2 −2
Original line number Diff line number Diff line
@@ -1436,12 +1436,12 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, 
	template.num_kcontrols = le32_to_cpu(w->num_kcontrols);

	kc = devm_kcalloc(tplg->dev, le32_to_cpu(w->num_kcontrols), sizeof(*kc), GFP_KERNEL);

	if (!kc)

		goto err;

		goto hdr_err;



	kcontrol_type = devm_kcalloc(tplg->dev, le32_to_cpu(w->num_kcontrols), sizeof(unsigned int),

				     GFP_KERNEL);

	if (!kcontrol_type)

		goto err;

		goto hdr_err;



	for (i = 0; i < le32_to_cpu(w->num_kcontrols); i++) {

		control_hdr = (struct snd_soc_tplg_ctl_hdr *)tplg->pos;