diff options
| author | Kirill Tkhai <ktkhai@parallels.com> | 2014-09-22 22:36:36 +0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-17 14:11:51 +0000 |
| commit | decad6eb2dce096cae3913b73b008d44c6d3c753 (patch) | |
| tree | 427f80fea4d3034b20df698ca8bf290d20f47101 | |
| parent | 3fd48a664c9f50254e7a03d3e3614630c9487b45 (diff) | |
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>
[ luis: backported to 3.16: used peterz's backport to 3.17 ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | kernel/sched/core.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 169720f46c30..07f41f4fe4db 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3983,13 +3983,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: |