]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.17-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Nov 2014 23:49:58 +0000 (08:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Nov 2014 23:49:58 +0000 (08:49 +0900)
added patches:
sched-use-rq-rd-in-sched_setaffinity-under-rcu-read-lock.patch

queue-3.17/sched-use-rq-rd-in-sched_setaffinity-under-rcu-read-lock.patch [new file with mode: 0644]
queue-3.17/series

diff --git a/queue-3.17/sched-use-rq-rd-in-sched_setaffinity-under-rcu-read-lock.patch b/queue-3.17/sched-use-rq-rd-in-sched_setaffinity-under-rcu-read-lock.patch
new file mode 100644 (file)
index 0000000..0789692
--- /dev/null
@@ -0,0 +1,44 @@
+From f1e3a0932f3a9554371792a7daaf1e0eb19f66d5 Mon Sep 17 00:00:00 2001
+From: Kirill Tkhai <ktkhai@parallels.com>
+Date: Mon, 22 Sep 2014 22:36:36 +0400
+Subject: sched: Use rq->rd in sched_setaffinity() under RCU read lock
+
+From: Kirill Tkhai <ktkhai@parallels.com>
+
+commit f1e3a0932f3a9554371792a7daaf1e0eb19f66d5 upstream.
+
+Probability of use-after-free isn't zero in this place.
+
+Signed-off-by: Kirill Tkhai <ktkhai@parallels.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Link: http://lkml.kernel.org/r/20140922183636.11015.83611.stgit@localhost
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/sched/core.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -4008,13 +4008,14 @@ long sched_setaffinity(pid_t pid, const
+        * root_domain.
+        */
+ #ifdef CONFIG_SMP
+-      if (task_has_dl_policy(p)) {
+-              const struct cpumask *span = task_rq(p)->rd->span;
+-
+-              if (dl_bandwidth_enabled() && !cpumask_subset(span, new_mask)) {
++      if (task_has_dl_policy(p) && dl_bandwidth_enabled()) {
++              rcu_read_lock();
++              if (!cpumask_subset(task_rq(p)->rd->span, new_mask)) {
+                       retval = -EBUSY;
++                      rcu_read_unlock();
+                       goto out_unlock;
+               }
++              rcu_read_unlock();
+       }
+ #endif
+ again:
index ea9fb9114705f72b93fa812562a7b2e01fc75ef2..e76318c5eac3d248d2a0bb3e55faa7ff3e00954c 100644 (file)
@@ -279,3 +279,4 @@ crypto-algif-avoid-excessive-use-of-socket-buffer-in-skcipher.patch
 mtd-m25p80-fix-module-aliases-for-m25p80.patch
 usb-dwc3-gadget-fix-set_halt-bug-with-pending-transfers.patch
 usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch
+sched-use-rq-rd-in-sched_setaffinity-under-rcu-read-lock.patch