drm/sched: Cancel and flush all outstanding jobs before finish.
authorAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Mon, 18 Jan 2021 21:01:13 +0000 (16:01 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 10:38:27 +0000 (11:38 +0100)
commit e582951baabba3e278c97169d0acc1e09b24a72e upstream.

To avoid any possible use after free.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/414814/
CC: stable@vger.kernel.org
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/scheduler/sched_main.c

index 9a0d77a6801807129b457040540569a5730656f3..7111e0f527b0b943b1bdcb042af9e0a13972be50 100644 (file)
@@ -890,6 +890,9 @@ void drm_sched_fini(struct drm_gpu_scheduler *sched)
        if (sched->thread)
                kthread_stop(sched->thread);
 
+       /* Confirm no work left behind accessing device structures */
+       cancel_delayed_work_sync(&sched->work_tdr);
+
        sched->ready = false;
 }
 EXPORT_SYMBOL(drm_sched_fini);