2018-01-02 13:25:08

by Xiongwei Song

Subject: [PATCH v3] 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.

Signed-off-by: Xiongwei Song <[email protected]>
---
v2->v3: delete goto expression
v1->v2: delete kfree _manager
---
drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index b5ba6441489f..5d252fb27a82 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -1007,6 +1007,8 @@ 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)
+ return -ENOMEM;

ttm_page_pool_init_locked(&_manager->wc_pool, GFP_HIGHUSER, "wc", 0);

--
2.15.1

2018-01-02 14:34:07

by Christian König

Subject: Re: [PATCH v3] drm/ttm: check the return value of kzalloc

Am 02.01.2018 um 14:24 schrieb Xiongwei Song:
> 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.
>
> Signed-off-by: Xiongwei Song <[email protected]>

Reviewed-by: Christian König <[email protected]>

Going to pick that up for the next release.

Thanks,
Christian.

> ---
> v2->v3: delete goto expression
> v1->v2: delete kfree _manager
> ---
> drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
> index b5ba6441489f..5d252fb27a82 100644
> --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
> +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
> @@ -1007,6 +1007,8 @@ 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)
> + return -ENOMEM;
>
> ttm_page_pool_init_locked(&_manager->wc_pool, GFP_HIGHUSER, "wc", 0);
>