Commit 650e0826 authored by Tim Huang's avatar Tim Huang Committed by He Yujie
Browse files

drm/amdgpu: fix mc_data out-of-bounds read warning 

stable inclusion
from stable-v5.10.226
commit 310b9d8363b88e818afec97ca7652bd7fe3d0650
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IARV9S
CVE: CVE-2024-46722

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



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

[ Upstream commit 51dfc0a4d609fe700750a62f41447f01b8c9ea50 ]

Clear warning that read mc_data[i-1] may out-of-bounds.

Signed-off-by: default avatarTim Huang <Tim.Huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@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 avatarHe Yujie <coka.heyujie@huawei.com>
parent 710d9571

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

+2 −0
Original line number Diff line number Diff line
@@ -1626,6 +1626,8 @@ int amdgpu_atombios_init_mc_reg_table(struct amdgpu_device *adev, 
										(u32)le32_to_cpu(*((u32 *)reg_data + j));

									j++;

								} else if ((reg_table->mc_reg_address[i].pre_reg_data & LOW_NIBBLE_MASK) == DATA_EQU_PREV) {

									if (i == 0)

										continue;

									reg_table->mc_reg_table_entry[num_ranges].mc_data[i] =

										reg_table->mc_reg_table_entry[num_ranges].mc_data[i - 1];

								}