drm/amdgpu: Fix null pointer dereference
Subsystems (2)
PATCH 1/1 drm/amdgpu: Fix null pointer dereference
amdgpu_reg_state_sysfs_fini could be invoked at the time when asic_func is even not initialized, i.e., amdgpu_discovery_init fails for some reason.
Signed-off-by Hawking Zhang <[email protected]>
--- drivers/gpu/drm/amd/include/amdgpu_reg_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/include/amdgpu_reg_state.h +1 -1
@@ -138,7 +138,7 @@ static inline size_t amdgpu_reginst_size(uint16_t num_inst, size_t inst_size, }#define amdgpu_asic_get_reg_state_supported (adev) \ - ((adev)->asic_funcs->get_reg_state ? 1 : 0) + (((adev)->asic_funcs && (adev)->asic_funcs->get_reg_state) ? 1 : 0)#define amdgpu_asic_get_reg_state (adev, state, buf, size) \ ((adev)->asic_funcs->get_reg_state ? \
Signature · 1 line
2.17.1
[AMD Official Use Only - General]
Reviewed-by Lijo Lazar <[email protected]>
Thanks,
Lijo
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Monday, January 22, 2024 3:27 PM
To: [email protected]; Lazar, Lijo <[email protected]>; Deucher, Alexander <[email protected]>; Ma, Le <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: Fix null pointer dereference
amdgpu_reg_state_sysfs_fini could be invoked at the time when asic_func is even not initialized, i.e., amdgpu_discovery_init fails for some reason.
Signed-off-by Hawking Zhang <[email protected]>
--- drivers/gpu/drm/amd/include/amdgpu_reg_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/include/amdgpu_reg_state.h +1 -2
@@ -138,7 +138,7 @@ static inline size_t amdgpu_reginst_size(uint16_t num_inst, size_t inst_size, }#define amdgpu_asic_get_reg_state_supported (adev) \ - ((adev)->asic_funcs->get_reg_state ? 1 : 0) + (((adev)->asic_funcs && (adev)->asic_funcs->get_reg_state) ? 1 : 0)#define amdgpu_asic_get_reg_state (adev, state, buf, size) \ ((adev)->asic_funcs->get_reg_state ? \ --
2.17.1