From 5dc3f516cb610dd626178f36f9b25782e7a842dc Mon Sep 17 00:00:00 2001 From: Srinivasan Shanmugam Date: Tue, 15 Sep 2026 12:10:07 +0530 Subject: [PATCH] drm/amdgpu: Fix NULL dereference in amdgpu_ualink_info_set_accel_state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 0a6da5dcfe42 ("drm/amdgpu: Improve ualink state transitions") introduced an access to info->accel_state before checking whether info is NULL. Move the access after the NULL check to avoid a potential NULL pointer dereference. Fixes: 0a6da5dcfe42 ("drm/amdgpu: Improve ualink state transitions") Reported-by: Dan Carpenter Cc: Lijo Lazar Cc: Felix Kuehling Cc: Christian König Cc: Alex Deucher Signed-off-by: Srinivasan Shanmugam Reviewed-by: Lijo Lazar Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c index b2c2650b0149..35aabc4c4526 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c @@ -162,7 +162,7 @@ amdgpu_ualink_info_set_accel_state(struct amdgpu_device *adev, struct amdgpu_ualink_info *info, enum psp_gfx_ual_config_state cfg_state) { - enum amdgpu_ualink_accel_state cur = info->accel_state; + enum amdgpu_ualink_accel_state cur; enum amdgpu_ualink_accel_state target; bool ppod_validated; bool vpod_validated; @@ -170,6 +170,8 @@ amdgpu_ualink_info_set_accel_state(struct amdgpu_device *adev, if (!info) return; + cur = info->accel_state; + ppod_validated = cur >= AMDGPU_UALINK_ACCEL_STATE_PPOD_CONFIGURED && cur <= AMDGPU_UALINK_ACCEL_STATE_ACTIVE; vpod_validated = cur >= AMDGPU_UALINK_ACCEL_STATE_VPOD_CONFIGURED &&