On Mon, Nov 10, 2014 at 12:46:16PM +0100, Peter Zijlstra wrote:
> On Fri, Nov 07, 2014 at 05:26:57PM -0800, [email protected] wrote:
> > 
> > The patch below does not apply to the 3.17-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <[email protected]>.
> > 
> > thanks,
> > 
> > greg k-h
> > 
> > ------------------ original commit in Linus's tree ------------------
> > 
> > From f1e3a0932f3a9554371792a7daaf1e0eb19f66d5 Mon Sep 17 00:00:00 2001
> > From: Kirill Tkhai <[email protected]>
> > Date: Mon, 22 Sep 2014 22:36:36 +0400
> > Subject: [PATCH] sched: Use rq->rd in sched_setaffinity() under RCU read 
> > lock
> > 
> > Probability of use-after-free isn't zero in this place.
> > 
> > Signed-off-by: Kirill Tkhai <[email protected]>
> > Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
> > Cc: <[email protected]> # v3.14+
> > Cc: Paul E. McKenney <[email protected]>
> > Cc: Linus Torvalds <[email protected]>
> > Link: http://lkml.kernel.org/r/20140922183636.11015.83611.stgit@localhost
> > Signed-off-by: Ingo Molnar <[email protected]>
> 
> ---
>  kernel/sched/core.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index ec1a286684a5..3b6ed1b849ce 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -4004,13 +4004,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:

Thanks, now applied.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to