From 5b22adbfbd9639ffa26fd25b86f3267d064a99a3 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 4 May 2020 09:07:27 -0500 Subject: Linux v5.6.10 --- drm-scheduler-fix-drm_sched_get_cleanup_job.patch | 37 +++++++++++++++++++++++ kernel.spec | 6 +++- sources | 2 +- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 drm-scheduler-fix-drm_sched_get_cleanup_job.patch 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?= +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 + +commit 8623b5255ae7ccaf276aac3920787bf575fa6b37 upstream. + +We are racing to initialize sched->thread here, just always check the +current thread. + +Signed-off-by: Christian König +Reviewed-by: Andrey Grodzovsky +Reviewed-by: Kent Russell +Link: https://patchwork.freedesktop.org/patch/361303/ +Cc: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + 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 8f3a7ce01..0909526b9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -92,7 +92,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 8 +%define stable_update 10 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -903,6 +903,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 @@ -3000,6 +3001,9 @@ fi # # %changelog +* Mon May 04 2020 Justin M. Forbes - 5.6.10-300 +- Linux v5.6.10 + * Wed Apr 29 2020 Justin M. Forbes - 5.6.8-300 - Linux v5.6.8 - Fixes CVE-2020-11884 (rhbz 1828149 1829181) diff --git a/sources b/sources index 9ce2df236..f4324f7a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.6.tar.xz) = 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9 -SHA512 (patch-5.6.8.xz) = 1cbcafdf3ea0213c0ec29fb2b87dccb5773cec644d170e1e3c8b1a79f23828a697059be85d83842e263c5115c1d40bc14fbe151315d9d1f92d3eb2c17e996881 +SHA512 (patch-5.6.10.xz) = 57860a7576149a34c1ff9277a8daee8d4ee8574270561302e4fb3916a7f4c23cf298a3a7f13ba5370ec665548b679f5340d3ce6788152b4d8d79f41009efa865 -- cgit