Skip to content

Commit 8fee96a

Browse files
hoshinolinajannau
authored andcommitted
drm/scheduler: Fix UAF in drm_sched_fence_get_timeline_name
A signaled scheduler fence can outlive its scheduler, since fences are independencly reference counted. Therefore, we can't reference the scheduler in the get_timeline_name() implementation. Fixes oopses on `cat /sys/kernel/debug/dma_buf/bufinfo` when shared dma-bufs reference fences from GPU schedulers that no longer exist. Signed-off-by: Asahi Lina <lina@asahilina.net>
1 parent 5744564 commit 8fee96a

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

drivers/gpu/drm/scheduler/sched_entity.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,12 @@ static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity,
420420

421421
/*
422422
* Fence is from the same scheduler, only need to wait for
423-
* it to be scheduled
423+
* it to be scheduled.
424+
*
425+
* Note: s_fence->sched could have been freed and reallocated
426+
* as another scheduler. This false positive case is okay, as if
427+
* the old scheduler was freed all of its jobs must have
428+
* signaled their completion fences.
424429
*/
425430
fence = dma_fence_get(&s_fence->scheduled);
426431
dma_fence_put(entity->dependency);

drivers/gpu/drm/scheduler/sched_fence.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static const char *drm_sched_fence_get_driver_name(struct dma_fence *fence)
9292
static const char *drm_sched_fence_get_timeline_name(struct dma_fence *f)
9393
{
9494
struct drm_sched_fence *fence = to_drm_sched_fence(f);
95-
return (const char *)fence->sched->name;
95+
return (const char *)fence->sched_name;
9696
}
9797

9898
static void drm_sched_fence_free_rcu(struct rcu_head *rcu)
@@ -228,6 +228,8 @@ void drm_sched_fence_init(struct drm_sched_fence *fence,
228228
unsigned seq;
229229

230230
fence->sched = entity->rq->sched;
231+
strscpy(fence->sched_name, entity->rq->sched->name,
232+
sizeof(fence->sched_name));
231233
seq = atomic_inc_return(&entity->fence_seq);
232234
dma_fence_init(&fence->scheduled, &drm_sched_fence_ops_scheduled,
233235
&fence->lock, entity->fence_context, seq);

include/drm/gpu_scheduler.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,11 @@ struct drm_sched_fence {
301301
* @lock: the lock used by the scheduled and the finished fences.
302302
*/
303303
spinlock_t lock;
304+
/**
305+
* @sched_name: the name of the scheduler that owns this fence. We
306+
* keep a copy here since fences can outlive their scheduler.
307+
*/
308+
char sched_name[16];
304309
/**
305310
* @owner: job owner for debugging
306311
*/

0 commit comments

Comments
 (0)