Commit 6086487c authored Sep 23, 2024 by Tim Huang Committed by Liao Chen Sep 23, 2024

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

stable inclusion
from stable-v4.19.322
commit 82ac8f1d02886b5d8aeb9e058989d3bd6fc581e2
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IARV6G
CVE: CVE-2024-46723

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=82ac8f1d02886b5d8aeb9e058989d3bd6fc581e2



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

[ Upstream commit 8944acd0f9db33e17f387fdc75d33bb473d7936f ]

Clear warning that read ucode[] may out-of-bounds.

Signed-off-by: Tim Huang <Tim.Huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Liao Chen <liaochen4@huawei.com>

parent f2ffc6af

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -212,6 +212,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
		struct amdgpu_firmware_info *ucode;

		id = fw_type_convert(cgs_device, type);
		if (id >= AMDGPU_UCODE_ID_MAXIMUM)
		return -EINVAL;

		ucode = &adev->firmware.ucode[id];
		if (ucode->fw == NULL)
		return -EINVAL;