ASoC: fix memory leak
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Mon, 22 Feb 2016 08:44:31 +0000 (14:14 +0530)
committerMark Brown <broonie@kernel.org>
Mon, 22 Feb 2016 10:40:06 +0000 (19:40 +0900)
If dai_link is already bound then we just returned and leaked rtd and
rtd->codec_dais which were allocated by soc_new_pcm_runtime(). We do not
need this newly allocated rtd to check if dai_link is already binded. Lets
check first if it is already binded before allocating this memory.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index 790ee2bf1a474b394a286f650b2772c8d3436c05..d2e62b159610bba4dce327a259affc62a92a6cde 100644 (file)
@@ -986,16 +986,16 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
 
        dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name);
 
-       rtd = soc_new_pcm_runtime(card, dai_link);
-       if (!rtd)
-               return -ENOMEM;
-
        if (soc_is_dai_link_bound(card, dai_link)) {
                dev_dbg(card->dev, "ASoC: dai link %s already bound\n",
                        dai_link->name);
                return 0;
        }
 
+       rtd = soc_new_pcm_runtime(card, dai_link);
+       if (!rtd)
+               return -ENOMEM;
+
        cpu_dai_component.name = dai_link->cpu_name;
        cpu_dai_component.of_node = dai_link->cpu_of_node;
        cpu_dai_component.dai_name = dai_link->cpu_dai_name;