lkml.org 
[lkml]   [2019]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 075/211] media: vsp1: fix memory leak of dl on error return path
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit 70c55c1ad1a76e804ee5330e134674f5d2741cb7 ]

    Currently when the call vsp1_dl_body_get fails and returns null the
    error return path leaks the allocation of dl. Fix this by kfree'ing
    dl before returning.

    Addresses-Coverity: ("Resource leak")

    Fixes: 5d7936b8e27d ("media: vsp1: Convert display lists to use new body pool")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
    Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/vsp1/vsp1_dl.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c
    index 26289adaf658c..a5634ca85a316 100644
    --- a/drivers/media/platform/vsp1/vsp1_dl.c
    +++ b/drivers/media/platform/vsp1/vsp1_dl.c
    @@ -557,8 +557,10 @@ static struct vsp1_dl_list *vsp1_dl_list_alloc(struct vsp1_dl_manager *dlm)

    /* Get a default body for our list. */
    dl->body0 = vsp1_dl_body_get(dlm->pool);
    - if (!dl->body0)
    + if (!dl->body0) {
    + kfree(dl);
    return NULL;
    + }

    header_offset = dl->body0->max_entries * sizeof(*dl->body0->entries);

    --
    2.20.1


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