Commit 863d3d36 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by ZhangPeng
Browse files

drm/amdgpu: Fix possible NULL dereference in amdgpu_ras_query_error_status_helper() 

stable inclusion
from stable-v6.6.32
commit c364e7a34c85c2154fb2e47561965d5b5a0b69b1
bugzilla: https://gitee.com/openeuler/kernel/issues/IA4MGD

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



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

commit b8d55a90fd55b767c25687747e2b24abd1ef8680 upstream.

Return invalid error code -EINVAL for invalid block id.

Fixes the below:

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1183 amdgpu_ras_query_error_status_helper() error: we previously assumed 'info' could be null (see line 1176)

Suggested-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Cc: Tao Zhou <tao.zhou1@amd.com>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
[Ajay: applied AMDGPU_RAS_BLOCK_COUNT condition to amdgpu_ras_query_error_status()
       as amdgpu_ras_query_error_status_helper() not present in v6.6, v6.1
       amdgpu_ras_query_error_status_helper() was introduced in 8cc0f5669eb6]
Signed-off-by: default avatarAjay Kaher <ajay.kaher@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 08dae678

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

+3 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,9 @@ int amdgpu_ras_query_error_status(struct amdgpu_device *adev, 
	if (!obj)

		return -EINVAL;



	if (!info || info->head.block == AMDGPU_RAS_BLOCK_COUNT)

		return -EINVAL;



	if (info->head.block == AMDGPU_RAS_BLOCK__UMC) {

		amdgpu_ras_get_ecc_info(adev, &err_data);

	} else {