lkml.org 
[lkml]   [2020]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 60/86] ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
    Date
    From: Dragos Tarcatu <dragos_tarcatu@mentor.com>

    commit 2b2d5c4db732c027a14987cfccf767dac1b45170 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/soc-topology.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/sound/soc/soc-topology.c
    +++ b/sound/soc/soc-topology.c
    @@ -2154,8 +2154,11 @@ static int soc_tplg_link_elems_load(stru
    }

    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

    \
     
     \ /
      Last update: 2020-03-10 14:14    [W:4.042 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site