aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDragos Tarcatu <dragos_tarcatu@mentor.com>2020-02-07 20:53:24 +0200
committerMark Brown <broonie@kernel.org>2020-02-19 19:48:42 +0000
commit2b2d5c4db732c027a14987cfccf767dac1b45170 (patch)
treefe7c2c1b455ba541c3c811b5861a8a191508a0ad /sound
parentASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output (diff)
downloadlinux-dev-2b2d5c4db732c027a14987cfccf767dac1b45170.tar.xz
linux-dev-2b2d5c4db732c027a14987cfccf767dac1b45170.zip
ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-topology.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 107ba3ed5440..953517a73298 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -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