linux-kernel - [PATCH] drm/amd/display: rewrite the check for mods

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20221117073258.21214-1-jiasheng@iscas.ac.cn>
Date:   Thu, 17 Nov 2022 15:32:58 +0800
From:   Jiasheng Jiang <jiasheng@...as.ac.cn>
To:     harry.wentland@....com, sunpeng.li@....com,
        Rodrigo.Siqueira@....com, alexander.deucher@....com,
        christian.koenig@....com, Xinhui.Pan@....com, airlied@...il.com,
        daniel@...ll.ch, nicholas.kazlauskas@....com, roman.li@....com,
        aurabindo.pillai@....com, Jerry.Zuo@....com
Cc:     amd-gfx@...ts.freedesktop.org, dri-devel@...ts.freedesktop.org,
        linux-kernel@...r.kernel.org, Jiasheng Jiang <jiasheng@...as.ac.cn>
Subject: [PATCH] drm/amd/display: rewrite the check for mods

When the *mods is NULL, it should be better to return error immediately,
rather than continue with redundant operations.

Signed-off-by: Jiasheng Jiang <jiasheng@...as.ac.cn>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index e6854f7270a6..05efc76b2226 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@ -638,11 +638,14 @@ static int get_plane_modifiers(struct amdgpu_device *adev, unsigned int plane_ty
 		return 0;
 
 	*mods = kmalloc(capacity * sizeof(uint64_t), GFP_KERNEL);
+	if (!*mods)
+		return -ENOMEM;
+
 
 	if (plane_type == DRM_PLANE_TYPE_CURSOR) {
 		add_modifier(mods, &size, &capacity, DRM_FORMAT_MOD_LINEAR);
 		add_modifier(mods, &size, &capacity, DRM_FORMAT_MOD_INVALID);
-		return *mods ? 0 : -ENOMEM;
+		return 0;
 	}
 
 	switch (adev->family) {
@@ -671,9 +674,6 @@ static int get_plane_modifiers(struct amdgpu_device *adev, unsigned int plane_ty
 	/* INVALID marks the end of the list. */
 	add_modifier(mods, &size, &capacity, DRM_FORMAT_MOD_INVALID);
 
-	if (!*mods)
-		return -ENOMEM;
-
 	return 0;
 }
 
-- 
2.25.1