lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 336/717] staging: greybus: audio: Fix possible leak free widgets in gbaudio_dapm_free_controls
    Date
    From: Wang Hai <wanghai38@huawei.com>

    [ Upstream commit e77b259f67ab99f1e22ce895b9b1c637fd5f2d4c ]

    In gbaudio_dapm_free_controls(), if one of the widgets is not found, an error
    will be returned directly, which will cause the rest to be unable to be freed,
    resulting in leak.

    This patch fixes the bug. If if one of them is not found, just skip and free the others.

    Fixes: 510e340efe0c ("staging: greybus: audio: Add helper APIs for dynamic audio module")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Reviewed-by: Vaibhav Agarwal <vaibhav.sr@gmail.com>
    Signed-off-by: Wang Hai <wanghai38@huawei.com>
    Link: https://lore.kernel.org/r/20201205103827.31244-1-wanghai38@huawei.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/greybus/audio_helper.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/greybus/audio_helper.c b/drivers/staging/greybus/audio_helper.c
    index 237531ba60f30..3011b8abce389 100644
    --- a/drivers/staging/greybus/audio_helper.c
    +++ b/drivers/staging/greybus/audio_helper.c
    @@ -135,7 +135,8 @@ int gbaudio_dapm_free_controls(struct snd_soc_dapm_context *dapm,
    if (!w) {
    dev_err(dapm->dev, "%s: widget not found\n",
    widget->name);
    - return -EINVAL;
    + widget++;
    + continue;
    }
    widget++;
    #ifdef CONFIG_DEBUG_FS
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:16    [W:2.198 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site