ASoC: topology: Fix memory leak from soc_tplg_denum_create_texts
authorAmadeusz Sławiński <amadeuszx.slawinski@intel.com>
Fri, 25 Jan 2019 20:06:44 +0000 (14:06 -0600)
committerMark Brown <broonie@kernel.org>
Tue, 29 Jan 2019 18:03:23 +0000 (18:03 +0000)
dtexts is two dimensional array, so we also need to free it after
freeing its fields.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-topology.c

index abc2d804d5bf4b8df3f8a62469f6b0456da5d4fc..71bc5b8a9bd3c8eead6b7d94a4bbf4985a9dbe10 100644 (file)
@@ -410,6 +410,7 @@ static void remove_enum(struct snd_soc_component *comp,
        kfree(dobj->control.dvalues);
        for (i = 0; i < se->items; i++)
                kfree(dobj->control.dtexts[i]);
+       kfree(dobj->control.dtexts);
        kfree(se);
 }
 
@@ -467,6 +468,7 @@ static void remove_widget(struct snd_soc_component *comp,
                        kfree(dobj->control.dvalues);
                        for (j = 0; j < se->items; j++)
                                kfree(dobj->control.dtexts[j]);
+                       kfree(dobj->control.dtexts);
 
                        kfree(se);
                        kfree(w->kcontrol_news[i].name);
@@ -1361,6 +1363,7 @@ err_se:
                kfree(se->dobj.control.dvalues);
                for (j = 0; j < ec->items; j++)
                        kfree(se->dobj.control.dtexts[j]);
+               kfree(se->dobj.control.dtexts);
 
                kfree(se);
                kfree(kc[i].name);