mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 01:08:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

proc: add tgid_iter.pid_ns member

Browse Source 
next_tgid() accepts pid namespace as an argument, but it never changes
during readdir (which would be unthinkable thing to do anyway).

Move it inside iterator type and hide from direct usage.

Link: https://lore.kernel.org/20260422191745.435556-1-adobriyan@gmail.com
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan
2026-04-22 22:17:44 +03:00
committed by Andrew Morton
parent d60ec36cab
commit 9794de4500
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fs/proc/base.c
View File

@@ -3543,8 +3543,10 @@ struct dentry *proc_pid_lookup(struct dentry *dentry, unsigned int flags)
struct tgid_iter {
unsigned int tgid;
struct task_struct *task;
struct pid_namespace *pid_ns;
};
static struct tgid_iter next_tgid(struct pid_namespace *ns, struct tgid_iter iter)
static struct tgid_iter next_tgid(struct tgid_iter iter)
{
struct pid *pid;
@@ -3553,9 +3555,9 @@ static struct tgid_iter next_tgid(struct pid_namespace *ns, struct tgid_iter ite
rcu_read_lock();
retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
pid = find_ge_pid(iter.tgid, iter.pid_ns);
if (pid) {
iter.tgid = pid_nr_ns(pid, ns);
iter.tgid = pid_nr_ns(pid, iter.pid_ns);
iter.task = pid_task(pid, PIDTYPE_TGID);
if (!iter.task) {
iter.tgid += 1;
@@ -3574,7 +3576,7 @@ int proc_pid_readdir(struct file *file, struct dir_context *ctx)
{
struct tgid_iter iter;
struct proc_fs_info *fs_info = proc_sb_info(file_inode(file)->i_sb);
struct pid_namespace *ns = proc_pid_ns(file_inode(file)->i_sb);
struct pid_namespace *pid_ns = proc_pid_ns(file_inode(file)->i_sb);
loff_t pos = ctx->pos;
if (pos >= PID_MAX_LIMIT + TGID_OFFSET)
@@ -3592,9 +3594,10 @@ int proc_pid_readdir(struct file *file, struct dir_context *ctx)
}
iter.tgid = pos - TGID_OFFSET;
iter.task = NULL;
for (iter = next_tgid(ns, iter);
iter.pid_ns = pid_ns;
for (iter = next_tgid(iter);
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
iter.tgid += 1, iter = next_tgid(iter)) {
char name[10 + 1];
unsigned int len;