From: Greg Kroah-Hartman Date: Sat, 23 Sep 2023 08:30:33 +0000 (+0200) Subject: fix up queue-5.4/drm-mediatek-fix-potential-memory-leak-if-vmap-fail.patch X-Git-Tag: v4.14.326~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86a12715520b4d6c0c50eb16cb02d7f97b8a175a;p=thirdparty%2Fkernel%2Fstable-queue.git 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 2baf4d51986..ba9b2ac5f56 100644 --- 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 Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - 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 -