Skip to content

Commit bcf0488

Browse files
hoshinolinamarcan
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 c220e1f commit bcf0488

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
@@ -368,7 +368,12 @@ static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity)
368368

369369
/*
370370
* Fence is from the same scheduler, only need to wait for
371-
* it to be scheduled
371+
* it to be scheduled.
372+
*
373+
* Note: s_fence->sched could have been freed and reallocated
374+
* as another scheduler. This false positive case is okay, as if
375+
* the old scheduler was freed all of its jobs must have
376+
* signaled their completion fences.
372377
*/
373378
fence = dma_fence_get(&s_fence->scheduled);
374379
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
@@ -66,7 +66,7 @@ static const char *drm_sched_fence_get_driver_name(struct dma_fence *fence)
6666
static const char *drm_sched_fence_get_timeline_name(struct dma_fence *f)
6767
{
6868
struct drm_sched_fence *fence = to_drm_sched_fence(f);
69-
return (const char *)fence->sched->name;
69+
return (const char *)fence->sched_name;
7070
}
7171

7272
static void drm_sched_fence_free_rcu(struct rcu_head *rcu)
@@ -214,6 +214,8 @@ void drm_sched_fence_init(struct drm_sched_fence *fence,
214214
unsigned seq;
215215

216216
fence->sched = entity->rq->sched;
217+
strlcpy(fence->sched_name, entity->rq->sched->name,
218+
sizeof(fence->sched_name));
217219
seq = atomic_inc_return(&entity->fence_seq);
218220
dma_fence_init(&fence->scheduled, &drm_sched_fence_ops_scheduled,
219221
&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
@@ -305,6 +305,11 @@ struct drm_sched_fence {
305305
* @lock: the lock used by the scheduled and the finished fences.
306306
*/
307307
spinlock_t lock;
308+
/**
309+
* @sched_name: the name of the scheduler that owns this fence. We
310+
* keep a copy here since fences can outlive their scheduler.
311+
*/
312+
char sched_name[16];
308313
/**
309314
* @owner: job owner for debugging
310315
*/

0 commit comments

Comments
 (0)