From: Arunpravin Paneer Selvam Date: Mon, 9 Dec 2024 17:32:28 +0000 (+0530) Subject: drm/amdgpu: Fix NULL ptr dereference issue for non userq fences X-Git-Tag: v6.16-rc1~144^2~10^2~286 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9e20cb005fdb6a727dc1a85d7192a35eeb11987;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu: Fix NULL ptr dereference issue for non userq fences Add the correct fences count variable [num_fences] in the fences array iteration to handle the userq / non-userq fences. v2:(Christian) - All fences in the array either come from some reservation object or drm_syncobj. If any of those are NULL then there is a bug somewhere else. Signed-off-by: Arunpravin Paneer Selvam Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c index 20c36dc97c2ee..8a4d9495f9d78 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c @@ -817,7 +817,7 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, fences[num_fences++] = fence; } - for (i = 0, cnt = 0; i < wait_info->num_fences; i++) { + for (i = 0, cnt = 0; i < num_fences; i++) { struct amdgpu_userq_fence_driver *fence_drv; struct amdgpu_userq_fence *userq_fence; u32 index;