lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 362/542] drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit 40efb09a7f53125719e49864da008495e39aaa1e ]

    In vmw_cmdbuf_res_add if drm_ht_insert_item fails the allocated memory
    for cres should be released.

    Fixes: 18e4a4669c50 ("drm/vmwgfx: Fix compat shader namespace")
    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
    index 4ac55fc2bf970..44d858ce4ce7f 100644
    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
    @@ -209,8 +209,10 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man,

    cres->hash.key = user_key | (res_type << 24);
    ret = drm_ht_insert_item(&man->resources, &cres->hash);
    - if (unlikely(ret != 0))
    + if (unlikely(ret != 0)) {
    + kfree(cres);
    goto out_invalid_key;
    + }

    cres->state = VMW_CMDBUF_RES_ADD;
    cres->res = vmw_resource_reference(res);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:00    [W:2.475 / U:1.940 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site