[PATCH] drm/rockchip: gem: check drm_gem_object_init() return value

From: 邱晓金 <qiuxiaojin@qs-tech.com>
To: hjc <hjc@rock-chips.com>,  heiko <heiko@sntech.de>,
	 andy.yan <andy.yan@rock-chips.com>
Cc: dri-devel <dri-devel@lists.freedesktop.org>,
	airlied <airlied@gmail.com>, simona <simona@ffwll.ch>,
	"maarten.lankhorst" <maarten.lankhorst@linux.intel.com>,
	mripard <mripard@kernel.org>, tzimmermann <tzimmermann@suse.de>,
	linux-rockchip <linux-rockchip@lists.infradead.org>,
	邱晓金 <qiuxiaojin@cvte.com>
Subject: [PATCH] drm/rockchip: gem: check drm_gem_object_init() return value
Date: Wed, 6 May 2026 08:57:22 +0800	[thread overview]
Message-ID: <A381993FF0E67CFE+202605060857210496809@qs-tech.com> (raw)

From ab8b1592209438a04c635d4c6c40c398230c1ba7 Mon Sep 17 00:00:00 2001
From: Qiu Xiaojin <qiuxiaojin@qs-tech.com>
Date: Wed, 6 May 2026 08:52:45 +0800
Subject: [PATCH] drm/rockchip: gem: check drm_gem_object_init() return value

rockchip_gem_alloc_object() currently ignores the return value of

drm_gem_object_init(). If initialization fails, the function can
return an incompletely initialized GEM object.

Handle the failure by freeing the allocated object and returning
ERR_PTR(ret).

Fixes: 38f993b7c59e ("drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain")
Signed-off-by: Qiu Xiaojin <qiuxiaojin@qs-tech.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 09d14a072d27..ef16b1fabec3 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -286,6 +286,7 @@ static struct rockchip_gem_object *
 {
 	struct rockchip_gem_object *rk_obj;
 	struct drm_gem_object *obj;
+	int ret;
 
 	size = round_up(size, PAGE_SIZE);
 
@@ -297,7 +298,11 @@ static struct rockchip_gem_object *
 
 	obj->funcs = &rockchip_gem_object_funcs;
 
-	drm_gem_object_init(drm, obj, size);
+	ret = drm_gem_object_init(drm, obj, size);
+	if (ret) {
+		kfree(rk_obj);
+		return ERR_PTR(ret);
+	}
 
 	return rk_obj;
 }
-- 
2.34.1








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



Qiu Xiaojin


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
