]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amd/display: Stop amdgpu_dm initialize when stream nums greater than 6
authorHersen Wu <hersenxs.wu@amd.com>
Wed, 24 Apr 2024 20:00:19 +0000 (16:00 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Sep 2024 09:06:39 +0000 (11:06 +0200)
[ Upstream commit 84723eb6068c50610c5c0893980d230d7afa2105 ]

[Why]
Coverity reports OVERRUN warning. Should abort amdgpu_dm
initialize.

[How]
Return failure to amdgpu_dm_init.

Reviewed-by: Harry Wentland <harry.wentland@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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 29ef0ed44d5f4cae86b950efd07bb1922cfd2b79..50921b340b886315d3ad0281a9d945fe510d0472 100644 (file)
@@ -3341,7 +3341,10 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
 
        /* There is one primary plane per CRTC */
        primary_planes = dm->dc->caps.max_streams;
-       ASSERT(primary_planes <= AMDGPU_MAX_PLANES);
+       if (primary_planes > AMDGPU_MAX_PLANES) {
+               DRM_ERROR("DM: Plane nums out of 6 planes\n");
+               return -EINVAL;
+       }
 
        /*
         * Initialize primary planes, implicit planes for legacy IOCTLS.