Commit 24bb620a authored by Hersen Wu's avatar Hersen Wu Committed by Jinjiang Tu
Browse files

drm/amd/display: Stop amdgpu_dm initialize when stream nums greater than 6 

stable inclusion
from stable-v5.10.226
commit 754321ed63f0a4a31252ca72e0bd89a9e1888018
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAUATF
CVE: CVE-2024-46817

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



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

[ Upstream commit 84723eb6068c50610c5c0893980d230d7afa2105 ]

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

[How]
Return failure to amdgpu_dm_init.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJinjiang Tu <tujinjiang@huawei.com>
parent 0f104c99

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+4 −1
Original line number Diff line number Diff line
@@ -3344,7 +3344,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.