drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add
authorNavid Emamdoost <navid.emamdoost@gmail.com>
Wed, 25 Sep 2019 04:37:58 +0000 (23:37 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2020 07:36:49 +0000 (08:36 +0100)
[ 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

index 4ac55fc..44d858c 100644 (file)
@@ -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);