lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 443/530] drm/nouveau/nouveau_bo: fix potential memory leak in nouveau_bo_alloc()
    Date
    From: Jianglei Nie <niejianglei2021@163.com>

    [ Upstream commit 6dc548745d5b5102e3c53dc5097296ac270b6c69 ]

    nouveau_bo_alloc() allocates a memory chunk for "nvbo" with kzalloc().
    When some error occurs, "nvbo" should be released. But when
    WARN_ON(pi < 0)) equals true, the function return ERR_PTR without
    releasing the "nvbo", which will lead to a memory leak.

    We should release the "nvbo" with kfree() if WARN_ON(pi < 0)) equals true.

    Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
    Signed-off-by: Lyude Paul <lyude@redhat.com>
    Reviewed-by: Lyude Paul <lyude@redhat.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20220705094306.2244103-1-niejianglei2021@163.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
    index 511fb8dfb4c4..da58230bcb1f 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
    @@ -281,8 +281,10 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain,
    break;
    }

    - if (WARN_ON(pi < 0))
    + if (WARN_ON(pi < 0)) {
    + kfree(nvbo);
    return ERR_PTR(-EINVAL);
    + }

    /* Disable compression if suitable settings couldn't be found. */
    if (nvbo->comp && !vmm->page[pi].comp) {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 21:45    [W:2.209 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site