[PATCH] drm/amd/display: Skip inactive planes within ModeSupportAndSystemConfiguration

guocai.he.cn@windriver.com posted 1 patch 1 year ago
There is a newer version of this series
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 5 +++++
1 file changed, 5 insertions(+)
[PATCH] drm/amd/display: Skip inactive planes within ModeSupportAndSystemConfiguration
Posted by guocai.he.cn@windriver.com 1 year ago
From: Guocai He <guocai.he.cn@windriver.com>

commit a54f7e866cc73a4cb71b8b24bb568ba35c8969df upstream.

[Why]
Coverity reports Memory - illegal accesses.

[How]
Skip inactive planes.

Reviewed-by: Alex Hung <alex.hung@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Cherry-pick from a54f7e866cc73a4cb71b8b24bb568ba35c8969df
CVE-2024-46812

Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
---
 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
index 0fad15020c74..b5ce2a8f4f1c 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
@@ -892,6 +892,11 @@ void ModeSupportAndSystemConfiguration(struct display_mode_lib *mode_lib)
 
 	// Total Available Pipes Support Check
 	for (k = 0; k < mode_lib->vba.NumberOfActivePlanes; ++k) {
+        pipe_idx = get_pipe_idx(mode_lib, k);
+        if (pipe_idx == -1) {
+            ASSERT(0);
+            continue; // skip inactive planes
+        }
 		total_pipes += mode_lib->vba.DPPPerPlane[k];
 	}
 	ASSERT(total_pipes <= DC__NUM_DPP__MAX);
-- 
2.34.1