fix up queue-5.4/drm-mediatek-fix-potential-memory-leak-if-vmap-fail.patch

diff --git a/queue-5.4/drm-mediatek-fix-potential-memory-leak-if-vmap-fail.patch b/queue-5.4/drm-mediatek-fix-potential-memory-leak-if-vmap-fail.patch
index 2baf4d519860215174692dffcfb7e0e01b8a26e4..ba9b2ac5f5675e14dec4e6190781c32b862f1725 100644 (file)
--- a/queue-5.4/drm-mediatek-fix-potential-memory-leak-if-vmap-fail.patch
+++ b/queue-5.4/drm-mediatek-fix-potential-memory-leak-if-vmap-fail.patch
@@ -19,15 +19,14 @@ Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com
 Link: https://patchwork.kernel.org/project/dri-devel/patch/20230706134000.130098-1-suijingfeng@loongson.cn/
 Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++++-
+ drivers/gpu/drm/mediatek/mtk_drm_gem.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
-index 2fa432287d690..e51394982efb6 100644
 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
 +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
-@@ -267,7 +267,11 @@ void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj)
+@@ -267,7 +267,11 @@ void *mtk_drm_gem_prime_vmap(struct drm_
        }
        mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
                               pgprot_writecombine(PAGE_KERNEL));
@@ -35,11 +34,8 @@ index 2fa432287d690..e51394982efb6 100644
 +      if (!mtk_gem->kvaddr) {
 +              kfree(sgt);
 +              kfree(mtk_gem->pages);
-+              return -ENOMEM;
++              return ERR_PTR(-ENOMEM);
 +      }
  out:
        kfree(sgt);
  
--- 
-2.40.1
-