Commit 3ce3b998 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Guo Mengqi
Browse files

fs/proc: do_task_stat: use __for_each_thread() 

mainline inclusion
from mainline-v6.7-rc1
commit 7904e53ed5a20fc678c01d5d1b07ec486425bb6a
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9E2EL
CVE: CVE-2024-26686

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7904e53ed5a20fc678c01d5d1b07ec486425bb6a

--------------------------------

do/while_each_thread should be avoided when possible.

Link: https://lkml.kernel.org/r/20230909164501.GA11581@redhat.com


Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarZhao Wenhui <zhaowenhui8@huawei.com>
parent d183b812

fs/proc/array.c

+4 −3
Original line number Diff line number Diff line
@@ -515,12 +515,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, 


		/* add up live thread stats at the group level */

		if (whole) {

			struct task_struct *t = task;

			do {

			struct task_struct *t;



			__for_each_thread(sig, t) {

				min_flt += t->min_flt;

				maj_flt += t->maj_flt;

				gtime += task_gtime(t);

			} while_each_thread(task, t);

			}



			min_flt += sig->min_flt;

			maj_flt += sig->maj_flt;