1 files changed, 4 insertions, 0 deletions

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index a7df319c2e9a..9538a12d42d6 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4550,6 +4550,10 @@ struct task_struct *css_task_iter_next(struct css_task_iter *it)
 
         spin_lock_irq(&css_set_lock);
 
+        /* @it may be half-advanced by skips, finish advancing */
+        if (it->flags & CSS_TASK_ITER_SKIPPED)
+                css_task_iter_advance(it);
+
         if (it->task_pos) {
                 it->cur_task = list_entry(it->task_pos, struct task_struct,
                                           cg_list);