]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
authorDragos Tarcatu <dragos_tarcatu@mentor.com>
Fri, 7 Feb 2020 18:53:24 +0000 (20:53 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 19 Feb 2020 19:48:42 +0000 (19:48 +0000)
If soc_tplg_link_config() fails, _link needs to be freed in case of
topology ABI version mismatch. However the current code is returning
directly and ends up leaking memory in this case.
This patch fixes that.

Fixes: 593d9e52f9bb ("ASoC: topology: Add support to configure existing physical DAI links")
Signed-off-by: Dragos Tarcatu <dragos_tarcatu@mentor.com>
Link: https://lore.kernel.org/r/20200207185325.22320-2-dragos_tarcatu@mentor.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-topology.c

index 107ba3ed5440d1f2c50b32d96d5a6b3ad3fa3a63..953517a732983cc52d7d2084c286a371fcf64c33 100644 (file)
@@ -2376,8 +2376,11 @@ static int soc_tplg_link_elems_load(struct soc_tplg *tplg,
                }
 
                ret = soc_tplg_link_config(tplg, _link);
-               if (ret < 0)
+               if (ret < 0) {
+                       if (!abi_match)
+                               kfree(_link);
                        return ret;
+               }
 
                /* offset by version-specific struct size and
                 * real priv data size