diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-04 16:39:40 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-04 16:39:40 +0200 |
| commit | 6bd5671424efc3dc231a92770b2c4bfccedc0225 (patch) | |
| tree | f139f2d77d2dd9114306a15665981e91cd93ee54 | |
| parent | 50f533857d4bd583efd4fcd0f703299f2b67d0c2 (diff) | |
| parent | e80611595fbaa51a58b33f2c641915772cdcd7b9 (diff) | |
| download | kernel-6bd5671424efc3dc231a92770b2c4bfccedc0225.tar.gz kernel-6bd5671424efc3dc231a92770b2c4bfccedc0225.tar.xz kernel-6bd5671424efc3dc231a92770b2c4bfccedc0225.zip | |
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
| -rw-r--r-- | drm-scheduler-fix-drm_sched_get_cleanup_job.patch | 37 | ||||
| -rw-r--r-- | kernel.spec | 4 |
2 files changed, 41 insertions, 0 deletions
diff --git a/drm-scheduler-fix-drm_sched_get_cleanup_job.patch b/drm-scheduler-fix-drm_sched_get_cleanup_job.patch new file mode 100644 index 000000000..db232c0cd --- /dev/null +++ b/drm-scheduler-fix-drm_sched_get_cleanup_job.patch @@ -0,0 +1,37 @@ +From 8623b5255ae7ccaf276aac3920787bf575fa6b37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Sat, 11 Apr 2020 11:54:01 +0200 +Subject: drm/scheduler: fix drm_sched_get_cleanup_job +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Christian König <christian.koenig@amd.com> + +commit 8623b5255ae7ccaf276aac3920787bf575fa6b37 upstream. + +We are racing to initialize sched->thread here, just always check the +current thread. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Reviewed-by: Kent Russell <kent.russell@amd.com> +Link: https://patchwork.freedesktop.org/patch/361303/ +Cc: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + drivers/gpu/drm/scheduler/sched_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/scheduler/sched_main.c ++++ b/drivers/gpu/drm/scheduler/sched_main.c +@@ -687,7 +687,7 @@ drm_sched_get_cleanup_job(struct drm_gpu + */ + if ((sched->timeout != MAX_SCHEDULE_TIMEOUT && + !cancel_delayed_work(&sched->work_tdr)) || +- __kthread_should_park(sched->thread)) ++ kthread_should_park()) + return NULL; + + spin_lock_irqsave(&sched->job_list_lock, flags); diff --git a/kernel.spec b/kernel.spec index cf82f4580..8812f0df7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -919,6 +919,7 @@ Patch511: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch Patch512: drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch Patch513: 0001-drm-i915-gem-Hold-obj-vma.lock-over-for_each_ggtt_vm.patch +Patch514: drm-scheduler-fix-drm_sched_get_cleanup_job.patch # END OF PATCH DEFINITIONS @@ -2953,6 +2954,9 @@ fi # # %changelog +* Mon May 04 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.10-200 +- Linux v5.6.10 + * Wed Apr 29 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.8-200 - Linux v5.6.8 - Fixes CVE-2020-11884 (rhbz 1828149 1829181) |