lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 92/96] ASoC: rsnd: dont double free kctrl
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Colin Ian King <colin.king@canonical.com>


    [ Upstream commit 0ea617a298dcdc2251b4e10f83ac3f3e627b66e3 ]

    On an error, snd_ctl_add already free's kctrl, so calling snd_ctl_free_one
    to free it again leads to a double free error. Fix this by removing
    the extraneous snd_ctl_free_one call.

    Issue found using static analysis with CoverityScan, CID 1372908

    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/sh/rcar/core.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/sound/soc/sh/rcar/core.c
    +++ b/sound/soc/sh/rcar/core.c
    @@ -1049,10 +1049,8 @@ static int __rsnd_kctrl_new(struct rsnd_
    return -ENOMEM;

    ret = snd_ctl_add(card, kctrl);
    - if (ret < 0) {
    - snd_ctl_free_one(kctrl);
    + if (ret < 0)
    return ret;
    - }

    cfg->update = update;
    cfg->card = card;

    \
     
     \ /
      Last update: 2017-11-28 13:08    [W:4.091 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site