[RFC PATCH v2 05/13] rootns: Add rootns_wait() system call

From: Jarkko Sakkinen

Date: Tue Nov 17 2026 - 18:14:46 EST


wait4() and waitid() only allow a parent or subreaper to collect exit
status, so an external manager holding a rootns file descriptor cannot
wait on a rootns init process forked by another process or observe exit
status multiple times across observers.

Add the rootns_wait() system call and its compat entry point to wait on
a rootns file descriptor until its init thread group exits and report
the recorded wait status and rusage. Return the init TGID translated
into the caller's active PID namespace, 0 for WNOHANG while still
running, or -ECHILD when the PID is not visible to the caller.

Co-developed-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
---
include/linux/compat.h | 4 ++
include/linux/syscalls.h | 2 +
kernel/rootns.c | 105 +++++++++++++++++++++++++++++++++++++++
kernel/sys_ni.c | 2 +
4 files changed, 113 insertions(+)

diff --git a/include/linux/compat.h b/include/linux/compat.h
index ad37ca617e65..3a9ac9dbb24c 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -779,6 +779,10 @@ asmlinkage long compat_sys_recvmmsg_time32(int fd, struct compat_mmsghdr __user
asmlinkage long compat_sys_wait4(compat_pid_t pid,
compat_uint_t __user *stat_addr, int options,
struct compat_rusage __user *ru);
+asmlinkage long compat_sys_rootns_wait(int rootnsfd,
+ compat_int_t __user *status,
+ unsigned int options,
+ struct compat_rusage __user *ru);
asmlinkage long compat_sys_fanotify_mark(int, unsigned int, __u32, __u32,
int, const char __user *);
asmlinkage long compat_sys_open_by_handle_at(int mountdirfd,
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 272d54bddbe2..60e9c4ff71e7 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1007,6 +1007,8 @@ asmlinkage long sys_lsm_set_self_attr(unsigned int attr, struct lsm_ctx __user *
u32 size, u32 flags);
asmlinkage long sys_lsm_list_modules(u64 __user *ids, u32 __user *size, u32 flags);
asmlinkage long sys_rootns_create(unsigned int flags);
+asmlinkage long sys_rootns_wait(int rootnsfd, int __user *status,
+ unsigned int options, struct rusage __user *ru);

/*
* Architecture-specific system calls
diff --git a/kernel/rootns.c b/kernel/rootns.c
index caa810b65d0d..83ab759a31ec 100644
--- a/kernel/rootns.c
+++ b/kernel/rootns.c
@@ -5,6 +5,8 @@

#include <linux/poll.h>
#include <linux/wait.h>
+#include <uapi/linux/wait.h>
+#include <linux/file.h>
#include <linux/fs.h>
#include <linux/anon_inodes.h>
#include <linux/rootns.h>
@@ -284,3 +286,106 @@ SYSCALL_DEFINE1(rootns_create, unsigned int, flags)

return fd;
}
+
+/*
+ * Wait for rootns init to exit and report results for the caller.
+ *
+ * Returns caller-visible init TGID on success, 0 for WNOHANG when still
+ * running, and -ECHILD when init pid is not visible in caller pidns.
+ */
+static long rootns_wait_common(int rootnsfd, unsigned int options,
+ int *status, struct rusage *ru)
+{
+ CLASS(fd, f)(rootnsfd);
+ struct pid_namespace *pid_ns = task_active_pid_ns(current);
+ struct rootns *rootns;
+ long ret;
+
+ if (fd_empty(f))
+ return -EBADF;
+ if (!is_rootns_file(fd_file(f)) || (options & ~WNOHANG))
+ return -EINVAL;
+
+ rootns = fd_file(f)->private_data;
+ if (!(options & WNOHANG)) {
+ ret = wait_event_killable(rootns->waitq,
+ READ_ONCE(rootns->state) == ROOTNS_DEAD);
+ if (ret)
+ return ret;
+ }
+
+ scoped_guard(spinlock, &rootns->lock) {
+ if (rootns->state != ROOTNS_DEAD)
+ return 0;
+ if (!rootns->init_pid)
+ return -ECHILD;
+ ret = pid_nr_ns(rootns->init_pid, pid_ns);
+ if (ret <= 0)
+ return -ECHILD;
+ if (status)
+ *status = rootns->exit_code;
+ if (ru)
+ *ru = rootns->rusage;
+ }
+
+ return ret;
+}
+
+/**
+ * sys_rootns_wait - Wait for root namespace termination and collect init status
+ * @rootnsfd: Root namespace control file descriptor
+ * @status: Optional user pointer to receive wait status of init
+ * @options: Wait options (0 or %WNOHANG)
+ * @ru: Optional user pointer to receive resource usage of init
+ *
+ * Wait killably (unless %WNOHANG is set in @options) until @rootnsfd reaches
+ * %ROOTNS_DEAD, then copy out the recorded exit status and resource usage of
+ * the rootns init thread group.
+ *
+ * Return: Caller-visible init TGID on success, 0 if %WNOHANG is set and the
+ * rootns has not terminated, %-ECHILD if init was never started or is not
+ * visible in the caller's active PID namespace, or negative error code.
+ */
+SYSCALL_DEFINE4(rootns_wait, int, rootnsfd, int __user *, status,
+ unsigned int, options, struct rusage __user *, ru)
+{
+ int code;
+ long ret;
+ struct rusage rusage;
+
+ ret = rootns_wait_common(rootnsfd, options,
+ status ? &code : NULL,
+ ru ? &rusage : NULL);
+ if (ret <= 0)
+ return ret;
+
+ if (status && put_user(code, status))
+ return -EFAULT;
+ if (ru && copy_to_user(ru, &rusage, sizeof(rusage)))
+ return -EFAULT;
+ return ret;
+}
+
+#ifdef CONFIG_COMPAT
+COMPAT_SYSCALL_DEFINE4(rootns_wait, int, rootnsfd,
+ compat_int_t __user *, status,
+ unsigned int, options,
+ struct compat_rusage __user *, ru)
+{
+ int code;
+ long ret;
+ struct rusage rusage;
+
+ ret = rootns_wait_common(rootnsfd, options,
+ status ? &code : NULL,
+ ru ? &rusage : NULL);
+ if (ret <= 0)
+ return ret;
+
+ if (status && put_user(code, status))
+ return -EFAULT;
+ if (ru && put_compat_rusage(&rusage, ru))
+ return -EFAULT;
+ return ret;
+}
+#endif
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 4a6c4337cc74..f9918d38107b 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -401,3 +401,5 @@ COND_SYSCALL(uprobe);

/* kernel/rootns.c */
COND_SYSCALL(rootns_create);
+COND_SYSCALL(rootns_wait);
+COND_SYSCALL_COMPAT(rootns_wait);
--
2.47.3