mirror of
https://github.com/torvalds/linux.git
synced 2026-09-24 06:24:02 +02:00
drm/msm: RCU-free the scheduler-containing ring and VM objects
Both struct msm_ringbuffer and struct msm_gem_vm embed a struct drm_gpu_scheduler. msm_ringbuffer_destroy() and the VM free callback msm_gem_vm_free() call drm_sched_fini() on the embedded scheduler and then free the containing object with plain kfree(). drm_sched_fence_get_timeline_name() returns fence->sched->name, and the scheduler fence keeps a .release callback so it is not ops-detached on signalling. A finished fence exported to userspace (the submit out-fence, or a VM_BIND fence, via sync_file / drm_syncobj) keeps pointing at the embedded scheduler after the ring/VM is freed, so a later get_timeline_name() -- reachable unprivileged through SYNC_IOC_FILE_INFO -- dereferences freed slab memory (KASAN slab-use-after-free read). Per the dma-fence lifetime contract the exporter must keep the data backing a signalled fence alive for an RCU grace period. Free the scheduler-containing objects with kfree_rcu() instead of kfree(). Fixes:1d8a5ca436("drm/msm: Conversion to drm scheduler") Fixes:92395af63a("drm/msm: Add VM_BIND submitqueue") Cc: stable@vger.kernel.org Signed-off-by: Jonghyuk Kim(MalHyuk) <malhyuk97@gmail.com> Patchwork: https://patchwork.freedesktop.org/patch/750234/ Message-ID: <20260902012720.880783-1-malhyuk97@gmail.com> Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
This commit is contained in:
parent
8061ee61b9
commit
01c8d1f385
|
|
@ -68,6 +68,9 @@ struct msm_gem_vm {
|
|||
/** @base: Inherit from drm_gpuvm. */
|
||||
struct drm_gpuvm base;
|
||||
|
||||
/** @rcu: RCU-delayed free so an exported sched fence->sched stays valid. */
|
||||
struct rcu_head rcu;
|
||||
|
||||
/**
|
||||
* @sched: Scheduler used for asynchronous VM_BIND request.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm)
|
|||
dma_fence_put(vm->last_fence);
|
||||
put_pid(vm->pid);
|
||||
kfree(vm->log);
|
||||
kfree(vm);
|
||||
kfree_rcu(vm, rcu);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -140,5 +140,5 @@ void msm_ringbuffer_destroy(struct msm_ringbuffer *ring)
|
|||
|
||||
msm_gem_kernel_put(ring->bo, ring->gpu->vm);
|
||||
|
||||
kfree(ring);
|
||||
kfree_rcu(ring, rcu);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ struct msm_ringbuffer {
|
|||
/*
|
||||
* The job scheduler for this ring.
|
||||
*/
|
||||
struct rcu_head rcu;
|
||||
struct drm_gpu_scheduler sched;
|
||||
bool sched_initialized;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user