sched: Fix NULL user_cpus_ptr check in dup_user_cpus_ptr()
PATCH v2 1/1 sched: Fix NULL user_cpus_ptr check in dup_user_cpus_ptr()
In general, a non-null user_cpus_ptr will remain set until the task dies. A possible exception to this is the fact that do_set_cpus_allowed() will clear a non-null user_cpus_ptr. To allow this possible racing condition, we need to check for NULL user_cpus_ptr under the pi_lock before duping the user mask.
Fixes 851a723e45d1 ("sched: Always clear user_cpus_ptr in do_set_cpus_allowed()")
Signed-off-by Waiman Long <[email protected]>
--- kernel/sched/core.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
kernel/sched/core.c +21 -2
@@ -2624,8 +2624,14 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)int dup_user_cpus_ptr (struct task_struct *dst,struct task_struct *src,int node) { +cpumask_t *user_mask =NULL ;unsigned long flags; +/* +* This check is racy and losing the race is a valid situation. +* It is not worth the extra overhead of taking the pi_lock on +* every fork/clone. +*/ if (!src->user_cpus_ptr)return 0 ;
@@ -2633,10 +2639,23 @@ int dup_user_cpus_ptr(struct task_struct *dst, struct task_struct *src,if (!dst->user_cpus_ptr)return -ENOMEM ; -/* Use pi_lock to protect content of user_cpus_ptr */ +/* +* Use pi_lock to protect content of user_cpus_ptr +* +* Though unlikely, user_cpus_ptr can be reset to NULL by a concurrent +* do_set_cpus_allowed(). When this happens, we need to clear +* dst->user_cpus_ptr and free the allocated memory afterward. +*/ raw_spin_lock_irqsave (&src->pi_lock, flags); -cpumask_copy (dst->user_cpus_ptr, src->user_cpus_ptr); +if (src->user_cpus_ptr) +cpumask_copy (dst->user_cpus_ptr, src->user_cpus_ptr); +else +swap (dst->user_cpus_ptr, user_mask);raw_spin_unlock_irqrestore (&src->pi_lock, flags); + +if (unlikely (user_mask)) +kfree (user_mask); +return 0 ; }
Signature · 1 line
2.31.1