]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fs/proc: do_task_stat: use __for_each_thread()
authorOleg Nesterov <oleg@redhat.com>
Sat, 9 Sep 2023 16:45:01 +0000 (18:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jul 2025 16:30:47 +0000 (18:30 +0200)
commit 7904e53ed5a20fc678c01d5d1b07ec486425bb6a upstream.

do/while_each_thread should be avoided when possible.

Link: https://lkml.kernel.org/r/20230909164501.GA11581@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stable-dep-of: 7601df8031fd ("fs/proc: do_task_stat: use sig->stats_lock to gather the threads/children stats")
Cc: stable@vger.kernel.org
[ mheyne: adjusted context ]
Signed-off-by: Maximilian Heyne <mheyne@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/proc/array.c

index 2cb01aaa6718721b5c9ca5012228be0c9eb9a853..2ff568dc58387ac30013d37dfbea52acd04b41f8 100644 (file)
@@ -530,18 +530,18 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                cgtime = sig->cgtime;
 
                if (whole) {
-                       struct task_struct *t = task;
+                       struct task_struct *t;
 
                        min_flt = sig->min_flt;
                        maj_flt = sig->maj_flt;
                        gtime = sig->gtime;
 
                        rcu_read_lock();
-                       do {
+                       __for_each_thread(sig, t) {
                                min_flt += t->min_flt;
                                maj_flt += t->maj_flt;
                                gtime += task_gtime(t);
-                       } while_each_thread(task, t);
+                       }
                        rcu_read_unlock();
                }
        } while (need_seqretry(&sig->stats_lock, seq));