drm/amdgpu/userqueue: Fix use after free in amdgpu_userq_buffer_vas_list_cleanup()
Subsystems (3)
PATCH 1/1 drm/amdgpu/userqueue: Fix use after free in amdgpu_userq_buffer_vas_list_cleanup()
The amdgpu_userq_buffer_va_list_del() function frees "va_cursor" but it is dereferenced on the next line when we print the debug message. Print the debug message first and then free it.
Fixes 2a28f9665dca ("drm/amdgpu: track the userq bo va for its obj management")
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +1 -1
@@ -159,9 +159,9 @@ static int amdgpu_userq_buffer_vas_list_cleanup(struct amdgpu_device *adev, r = -EINVAL ; goto err; } -amdgpu_userq_buffer_va_list_del (mapping, va_cursor);dev_dbg (adev->dev,"delete the userq:%p va:%llx\n" , queue, va_cursor->gpu_addr); +amdgpu_userq_buffer_va_list_del (mapping, va_cursor); } err:amdgpu_bo_unreserve (queue->vm->root.bo);
Signature · 1 line
2.51.0
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 29 lines · Dan Carpenter
The
amdgpu_userq_buffer_va_list_del()function frees "va_cursor" but it is dereferenced on the next line when we print the debug message. Print the debug message first and then free it.Fixes 2a28f9665dca ("drm/amdgpu: track the userq bo va for its obj management")Signed-off-by Dan Carpenter <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +1
-2@@ -159,9 +159,9 @@ static int amdgpu_userq_buffer_vas_list_cleanup(struct amdgpu_device *adev, r = -EINVAL ; goto err; } -amdgpu_userq_buffer_va_list_del (mapping, va_cursor);dev_dbg (adev->dev,"delete the userq:%p va:%llx\n" , queue, va_cursor->gpu_addr); +amdgpu_userq_buffer_va_list_del (mapping, va_cursor); } err:amdgpu_bo_unreserve (queue->vm->root.bo); --2.51.0