From a167db7bdd31c87ac942ecdacbc72cd9e15658eb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 12 Jul 2025 14:09:13 +0200 Subject: [PATCH] 5.10-stable patches added patches: fs-proc-do_task_stat-use-__for_each_thread.patch --- ...c-do_task_stat-use-__for_each_thread.patch | 48 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 49 insertions(+) create mode 100644 queue-5.10/fs-proc-do_task_stat-use-__for_each_thread.patch diff --git a/queue-5.10/fs-proc-do_task_stat-use-__for_each_thread.patch b/queue-5.10/fs-proc-do_task_stat-use-__for_each_thread.patch new file mode 100644 index 0000000000..437494c234 --- /dev/null +++ b/queue-5.10/fs-proc-do_task_stat-use-__for_each_thread.patch @@ -0,0 +1,48 @@ +From 7904e53ed5a20fc678c01d5d1b07ec486425bb6a Mon Sep 17 00:00:00 2001 +From: Oleg Nesterov +Date: Sat, 9 Sep 2023 18:45:01 +0200 +Subject: fs/proc: do_task_stat: use __for_each_thread() + +From: Oleg Nesterov + +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 +Cc: Eric W. Biederman +Signed-off-by: Andrew Morton +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 +Signed-off-by: Greg Kroah-Hartman +--- + fs/proc/array.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/fs/proc/array.c ++++ b/fs/proc/array.c +@@ -512,18 +512,18 @@ static int do_task_stat(struct seq_file + 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(); + + thread_group_cputime_adjusted(task, &utime, &stime); diff --git a/queue-5.10/series b/queue-5.10/series index 1115787d63..656c0ca248 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -162,3 +162,4 @@ atm-clip-fix-memory-leak-of-struct-clip_vcc.patch atm-clip-fix-infinite-recursive-call-of-clip_push.patch atm-clip-fix-null-pointer-dereference-in-vcc_sendmsg.patch net-sched-abort-__tc_modify_qdisc-if-parent-class-do.patch +fs-proc-do_task_stat-use-__for_each_thread.patch -- 2.47.2