[PATCH] drm/vmwgfx: fix a memleak in vmw_gmrid_man_get_node

Zhipeng Lu alexious at zju.edu.cn
Mon Dec 4 08:06:46 UTC 2023


When ida_alloc_max fails, resources allocated before should be freed,
including *res allocated by kmalloc and ttm_resource_init.

Fixes: d3bcb4b02fe9 ("drm/vmwgfx: switch the TTM backends to self alloc")
Signed-off-by: Zhipeng Lu <alexious at zju.edu.cn>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
index ceb4d3d3b965..220561b73493 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
@@ -65,6 +65,8 @@ static int vmw_gmrid_man_get_node(struct ttm_resource_manager *man,
 
 	id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL);
 	if (id < 0)
+		ttm_resource_fini(man, *res);
+		kfree(*res);
 		return id;
 
 	spin_lock(&gman->lock);
-- 
2.34.1



More information about the dri-devel mailing list