Skip to content

Commit cee0c33

Browse files
committed
cgroup: css_task_iter_skip()'d iterators must be advanced before accessed
b636fd3 ("cgroup: Implement css_task_iter_skip()") introduced css_task_iter_skip() which is used to fix task iterations skipping dying threadgroup leaders with live threads. Skipping is implemented as a subportion of full advancing but css_task_iter_next() forgot to fully advance a skipped iterator before determining the next task to visit causing it to return invalid task pointers. Fix it by making css_task_iter_next() fully advance the iterator if it has been skipped since the previous iteration. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: syzbot Link: http://lkml.kernel.org/r/00000000000097025d058a7fd785@google.com Fixes: b636fd3 ("cgroup: Implement css_task_iter_skip()")
1 parent c03cd77 commit cee0c33

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/cgroup/cgroup.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4550,6 +4550,10 @@ struct task_struct *css_task_iter_next(struct css_task_iter *it)
45504550

45514551
spin_lock_irq(&css_set_lock);
45524552

4553+
/* @it may be half-advanced by skips, finish advancing */
4554+
if (it->flags & CSS_TASK_ITER_SKIPPED)
4555+
css_task_iter_advance(it);
4556+
45534557
if (it->task_pos) {
45544558
it->cur_task = list_entry(it->task_pos, struct task_struct,
45554559
cg_list);

0 commit comments

Comments
 (0)