Commit 37e0af13 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by sanglipeng
Browse files

drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap() 

stable inclusion
from stable-v5.10.198
commit d0952ce316d133fffc7a632c7ce0ab254702070a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I95JOC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d0952ce316d133fffc7a632c7ce0ab254702070a



--------------------------------

When building with clang:

  drivers/gpu/drm/mediatek/mtk_drm_gem.c:255:10: error: incompatible integer to pointer conversion returning 'int' from a function with result type 'void *' [-Wint-conversion]
    255 |                 return -ENOMEM;
        |                        ^~~~~~~
  1 error generated.

GCC reports the same issue as a warning, rather than an error.

Prior to commit 7e542ff8 ("drm/mediatek: Use struct dma_buf_map in
GEM vmap ops"), this function returned a pointer rather than an integer.
This function is indirectly called in drm_gem_vmap(), which treats NULL
as -ENOMEM through an error pointer. Return NULL in this block to
resolve the warning but keep the same end result.

Fixes: 43f561e809aa ("drm/mediatek: Fix potential memory leak if vmap() fail")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 4e881990

drivers/gpu/drm/mediatek/mtk_drm_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj) 
	if (!mtk_gem->kvaddr) {

		kfree(sgt);

		kfree(mtk_gem->pages);

		return -ENOMEM;

		return NULL;

	}

out:

	kfree(sgt);