| From 46705de71253d92aba3d70ec3b1f22878b30a190 Mon Sep 17 00:00:00 2001 |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Date: Tue, 24 Sep 2019 23:37:58 -0500 |
| Subject: [PATCH] drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add |
| |
| commit 40efb09a7f53125719e49864da008495e39aaa1e upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c |
| index 4ac55fc2bf97..44d858ce4ce7 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.7.4 |
| |