[PATCH openEuler-22.03-LTS] drm/amdgpu: Fix the null pointer dereference to ras_manager - Kernel

28 Aug 2024

From: Ma Jun Jun.Ma2@amd.com
stable inclusion
from stable-v5.10.224
commit d81c1eeb333d84b3012a91c0500189dc1d71e46c
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAMM8O
CVE: CVE-2024-43908
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
[ Upstream commit 4c11d30c95576937c6c35e6f29884761f2dddb43 ]
Check ras_manager before using it
Signed-off-by: Ma Jun Jun.Ma2@amd.com
Reviewed-by: Lijo Lazar lijo.lazar@amd.com
Signed-off-by: Alex Deucher alexander.deucher@amd.com
Signed-off-by: Sasha Levin sashal@kernel.org
Signed-off-by: Ye Bin yebin10@huawei.com
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index eb22a190c242..d0f6b5a49d69 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -1345,12 +1345,15 @@ static void amdgpu_ras_interrupt_process_handler(struct work_struct *work)
 int amdgpu_ras_interrupt_dispatch(struct amdgpu_device *adev,
    	struct ras_dispatch_if *info)
 {
-	struct ras_manager *obj = amdgpu_ras_find_obj(adev, &info->head);
-	struct ras_ih_data *data = &obj->ih_data;
+	struct ras_manager *obj;
+	struct ras_ih_data *data;
+	obj = amdgpu_ras_find_obj(adev, &info->head);
    if (!obj)
    	return -EINVAL;
+	data = &obj->ih_data;
+
    if (data->inuse == 0)
    	return 0;
-- 
2.34.1


    