xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: dma-buf: Fix error path on system heaps use of the page pool

Browse Source 
Daniel Mentz relayed to me that Janghyuck Kim noted that
dma_buf_page_pool_create() returns NULL on error, so the
IS_ERR() check on the return value will never be true.

This patch fixes up the checking so we look for NULL instead and
properly return ENOMEM in that case.

Cc: Daniel Mentz <danielmentz@google.com>
Reported-by: Janghyuck Kim <janghyuck.kim@samsung.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Fixes: 23762f02e1 ("ANDROID: dma-buf: system_heap: Add pagepool support to system heap")
Change-Id: Ia428e262cda5cc6bd39a3fbcddade7877473a563
This commit is contained in:
John Stultz
2021-03-18 22:59:34 +00:00
committed by Greg Kroah-Hartman
parent 958c19b19b
commit 58f0e25d0d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma-buf/heaps/system_heap.c
View File

@@ -534,13 +534,13 @@ static int system_heap_create(void)
for (i = 0; i < NUM_ORDERS; i++) { for (i = 0; i < NUM_ORDERS; i++) {
pools[i] = dmabuf_page_pool_create(order_flags[i], orders[i]); pools[i] = dmabuf_page_pool_create(order_flags[i], orders[i]);
if (IS_ERR(pools[i])) { if (!pools[i]) {
int j; int j;
pr_err("%s: page pool creation failed!\n", __func__); pr_err("%s: page pool creation failed!\n", __func__);
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
dmabuf_page_pool_destroy(pools[j]); dmabuf_page_pool_destroy(pools[j]);
return PTR_ERR(pools[i]); return -ENOMEM;
} }
} }