aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Tkhai <ktkhai@parallels.com>2014-09-22 22:36:36 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 09:00:11 -0800
commit68dc002ad8efcd11942c94a1a3906d6feb1533af (patch)
tree99a9ddbc098db51dcd87178bfb98dec1008183fd
parent3ee437c556e18984624a018915ec34defa259423 (diff)
downloadlinux-yocto-68dc002ad8efcd11942c94a1a3906d6feb1533af.tar.gz
linux-yocto-68dc002ad8efcd11942c94a1a3906d6feb1533af.tar.bz2
linux-yocto-68dc002ad8efcd11942c94a1a3906d6feb1533af.zip
sched: Use rq->rd in sched_setaffinity() under RCU read lock
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>
-rw-r--r--kernel/sched/core.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index e3b8502283ac..9a3f3c4e1f5a 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3941,13 +3941,14 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
* 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: