Skip to contentSkip to conversation

drm/ttm: check the return value of kzalloc

PATCH Superseded Xiongwei Song 2 participants 2 messages Jan 2, 2018

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drm/ttm: check the return value of kzalloc

In the function ttm_page_alloc_init, kzalloc call is made for variable _manager, we need to check its return value, it may return NULL.

---
v1->v2: delete kfree _manager

---
 drivers/gpu/drm/ttm/ttm_page_alloc.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/ttm/ttm_page_alloc.c +6 -0
index b5ba6441489f..583d73edb7df 100644
@@ -1007,6 +1007,10 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
 	pr_info("Initializing pool allocator\n");
 
 	_manager = kzalloc(sizeof(*_manager), GFP_KERNEL);
+	if (!_manager) {
+		ret = -ENOMEM;
+		goto out;
+	}
 
 	ttm_page_pool_init_locked(&_manager->wc_pool, GFP_HIGHUSER, "wc", 0);
 
@@ -1041,6 +1045,8 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
 	ttm_pool_mm_shrink_init(_manager);
 
 	return 0;
+out:
+	return ret;
 }
 
 void ttm_page_alloc_fini(void)
Signature · 1 line
2.15.1
#1 lore raw

Am 02.01.2018 um 13:35 schrieb Xiongwei Song:

Quoted 15 lines

In the function ttm_page_alloc_init, kzalloc call is made for variable _manager, we need to check its return value, it may return NULL.

---
v1->v2: delete kfree _manager

---
  drivers/gpu/drm/ttm/ttm_page_alloc.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/gpu/drm/ttm/ttm_page_alloc.c +0 -0
index b5ba6441489f..583d73edb7df 100644

drivers/gpu/drm/ttm/ttm_page_alloc.c int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) · line 1013

Quoted 7 lines
drivers/gpu/drm/ttm/ttm_page_alloc.c +4 -0
@@ -1007,6 +1007,10 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
  	pr_info("Initializing pool allocator\n");
 
  	_manager = kzalloc(sizeof(*_manager), GFP_KERNEL);
+	if (!_manager) {
+		ret = -ENOMEM;
+		goto out;
+	}

A simpler "return -ENOMEM" should do here as well.

Regards,
Christian.

drivers/gpu/drm/ttm/ttm_page_alloc.c int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) · line 1052

Quoted 12 lines
drivers/gpu/drm/ttm/ttm_page_alloc.c +2 -0
  	ttm_page_pool_init_locked(&_manager->wc_pool, GFP_HIGHUSER, "wc", 0);
 
@@ -1041,6 +1045,8 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
  	ttm_pool_mm_shrink_init(_manager);
 
  	return 0;
+out:
+	return ret;
  }
 
  void ttm_page_alloc_fini(void)

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel