Unverified Commit 1ad741d0 authored by Colin Ian King's avatar Colin Ian King Committed by Mark Brown
Browse files

ASoC: topology: fix memory leaks on sm, se and sbe 



Currently when a kstrdup fails the error exit paths don't free
the allocations for sm, se and sbe.  This can be fixed by assigning
kc[i].private_value to these before doing the ksrtdup so that the error
exit path will be able to free these objects.

Addresses-Coverity: ("Resource leak")
Fixes: 9f90af3a ("ASoC: topology: Consolidate and fix asoc_tplg_dapm_widget_*_create flow")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8af26493

sound/soc/soc-topology.c

+3 −3
Original line number Diff line number Diff line
@@ -1326,10 +1326,10 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create( 
		dev_dbg(tplg->dev, " adding DAPM widget mixer control %s at %d\n",

			mc->hdr.name, i);



		kc[i].private_value = (long)sm;

		kc[i].name = kstrdup(mc->hdr.name, GFP_KERNEL);

		if (kc[i].name == NULL)

			goto err_sm;

		kc[i].private_value = (long)sm;

		kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;

		kc[i].access = mc->hdr.access;
@@ -1412,10 +1412,10 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_denum_create( 
		dev_dbg(tplg->dev, " adding DAPM widget enum control %s\n",

			ec->hdr.name);



		kc[i].private_value = (long)se;

		kc[i].name = kstrdup(ec->hdr.name, GFP_KERNEL);

		if (kc[i].name == NULL)

			goto err_se;

		kc[i].private_value = (long)se;

		kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;

		kc[i].access = ec->hdr.access;
@@ -1524,10 +1524,10 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dbytes_create( 
			"ASoC: adding bytes kcontrol %s with access 0x%x\n",

			be->hdr.name, be->hdr.access);



		kc[i].private_value = (long)sbe;

		kc[i].name = kstrdup(be->hdr.name, GFP_KERNEL);

		if (kc[i].name == NULL)

			goto err_sbe;

		kc[i].private_value = (long)sbe;

		kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;

		kc[i].access = be->hdr.access;

CRA Git | Maintained and supported by SUSTech CRA and CCSE