From: Ella Feng <ella.feng@nxp.com>
Date: Thu, 24 Oct 2019 15:10:15 +0000 (+0800)
Subject: MGS-5176 [#imx-1744] Coveriy - need free the pages if malloc memory failed
X-Git-Tag: rel_imx_4.19.35_1.1.0~7
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=47abcf5d5fd4e6d187d63e695982ea9d85fffb92;p=linux.git

MGS-5176 [#imx-1744] Coveriy - need free the pages if malloc memory failed

When alloc NonContiguous1MPages, if malloc fail, need free the pages to avoid memory leak

Signed-off-by: Xianzhong Li <xianzhong.li@nxp.com>
(cherry picked from commit 30b05a615613a7e47db5e98dddb0fae9ca42b924)
---

diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_gfp.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_gfp.c
index b157252c5780..059512a10f22 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_gfp.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_gfp.c
@@ -424,6 +424,7 @@ _NonContiguous1MPagesAlloc(
 
             if (order >= MAX_ORDER)
             {
+                kfree(pages);
                 _NonContiguous1MPagesFree(MdlPriv, MdlPriv->numPages1M);
                 return gcvNULL;
             }
@@ -433,6 +434,7 @@ _NonContiguous1MPagesAlloc(
 
         if (MdlPriv->Pages1M[i] == gcvNULL)
         {
+            kfree(pages);
             _NonContiguous1MPagesFree(MdlPriv, MdlPriv->numPages1M);
             return gcvNULL;
         }