Skip to content

Commit 39265cf

Browse files
joshdonsmb49
authored andcommitted
sched: fix warning in sched_setaffinity
BugLink: https://bugs.launchpad.net/bugs/2102118 [ Upstream commit 70ee794 ] Commit 8f9ea86 added some logic to sched_setaffinity that included a WARN when a per-task affinity assignment races with a cpuset update. Specifically, we can have a race where a cpuset update results in the task affinity no longer being a subset of the cpuset. That's fine; we have a fallback to instead use the cpuset mask. However, we have a WARN set up that will trigger if the cpuset mask has no overlap at all with the requested task affinity. This shouldn't be a warning condition; its trivial to create this condition. Reproduced the warning by the following setup: - $PID inside a cpuset cgroup - another thread repeatedly switching the cpuset cpus from 1-2 to just 1 - another thread repeatedly setting the $PID affinity (via taskset) to 2 Fixes: 8f9ea86 ("sched: Always preserve the user requested cpumask") Signed-off-by: Josh Don <joshdon@google.com> Acked-and-tested-by: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Waiman Long <longman@redhat.com> Tested-by: Madadi Vineeth Reddy <vineethr@linux.ibm.com> Link: https://lkml.kernel.org/r/20241111182738.1832953-1-joshdon@google.com Signed-off-by: Sasha Levin <sashal@kernel.org> [koichiroden: applied to an older path due to missing commit: 04746ed ("sched/syscalls: Split out kernel/sched/syscalls.c from kernel/sched/core.c")] CVE-2024-41932 Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent c8c875c commit 39265cf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/sched/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8389,7 +8389,7 @@ __sched_setaffinity(struct task_struct *p, struct affinity_context *ctx)
83898389
bool empty = !cpumask_and(new_mask, new_mask,
83908390
ctx->user_mask);
83918391

8392-
if (WARN_ON_ONCE(empty))
8392+
if (empty)
83938393
cpumask_copy(new_mask, cpus_allowed);
83948394
}
83958395
__set_cpus_allowed_ptr(p, ctx);

0 commit comments

Comments
 (0)