Commit ecbfa302 authored by Ma Jun's avatar Ma Jun Committed by Yi Yang
Browse files

drm/amdgpu: Fix out-of-bounds write warning 

stable inclusion
from stable-v6.6.50
commit a60d1f7ff62e453dde2d3b4907e178954d199844
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IARV95
CVE: CVE-2024-46725

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



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

[ Upstream commit be1684930f5262a622d40ce7a6f1423530d87f89 ]

Check the ring type value to fix the out-of-bounds
write warning

Signed-off-by: default avatarMa Jun <Jun.Ma2@amd.com>
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarTim Huang <Tim.Huang@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 avatarYi Yang <yiyang13@huawei.com>
parent 81a41d2a

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, 
	ring->max_dw = max_dw;

	ring->hw_prio = hw_prio;



	if (!ring->no_scheduler) {

	if (!ring->no_scheduler && ring->funcs->type < AMDGPU_HW_IP_NUM) {

		hw_ip = ring->funcs->type;

		num_sched = &adev->gpu_sched[hw_ip][hw_prio].num_scheds;

		adev->gpu_sched[hw_ip][hw_prio].sched[(*num_sched)++] =