Skip to content

Commit ea2f6a7

Browse files
committed
drm/xe: Don't free job in TDR
Freeing job in TDR is not safe as TDR can pass the run_job thread resulting in UAF. It is only safe for free job to naturally be called by the scheduler. Rather free job in TDR, add to pending list. Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2811 Cc: Matthew Auld <[email protected]> Fixes: e275d61 ("drm/xe/guc: Handle timing out of signaled jobs gracefully") Signed-off-by: Matthew Brost <[email protected]> Reviewed-by: Matthew Auld <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 90521df commit ea2f6a7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/gpu/drm/xe/xe_guc_submit.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,10 +1105,13 @@ guc_exec_queue_timedout_job(struct drm_sched_job *drm_job)
11051105

11061106
/*
11071107
* TDR has fired before free job worker. Common if exec queue
1108-
* immediately closed after last fence signaled.
1108+
* immediately closed after last fence signaled. Add back to pending
1109+
* list so job can be freed and kick scheduler ensuring free job is not
1110+
* lost.
11091111
*/
11101112
if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &job->fence->flags)) {
1111-
guc_exec_queue_free_job(drm_job);
1113+
xe_sched_add_pending_job(sched, job);
1114+
xe_sched_submission_start(sched);
11121115

11131116
return DRM_GPU_SCHED_STAT_NOMINAL;
11141117
}

0 commit comments

Comments
 (0)