/proc has historically had very opaque semantics about PID namespaces, which is a little unfortunate for container runtimes and other programs that deal with switching namespaces very often. One common issue is that of converting between PIDs in the process's namespace and PIDs in the namespace of /proc.
In principle, it is possible to do this today by opening a pidfd with pidfd_open(2) and then looking at /proc/self/fdinfo/$n (which will contain a PID value translated to the pid namespace associated with that procfs superblock). However, allocating a new file for each PID to be converted is less than ideal for programs that may need to scan procfs, and it is generally useful for userspace to be able to finally get this information from procfs.
So, add a new API to get the pid namespace of a procfs instance, in the form of an ioctl(2) you can call on the root directory of said procfs. The returned file descriptor will have O_CLOEXEC set. This acts as a sister feature to the new "pidns" mount option, finally allowing userspace full control of the pid namespaces associated with procfs instances.
The permission model for this is a bit looser than that of the "pidns" mount option (and also setns(2)) because /proc/1/ns/pid provides the same information, so as long as you have access to that magic-link (or something equivalently reasonable such as being in an ancestor pid namespace) it makes sense to allow userspace to grab a handle. Ideally we would check for ptrace-read access against all processes in the pidns (which is very likely to be true for at least one process, as SUID_DUMP_DISABLE is cleared on exec(2) and is rarely set by most programs), but this would obviously not scale.
setns(2) will still have their own permission checks, so being able to open a pidns handle doesn't really provide too many other capabilities.
Signed-off-by: Aleksa Sarai cyphar@cyphar.com --- Documentation/filesystems/proc.rst | 4 +++ fs/proc/root.c | 68 ++++++++++++++++++++++++++++++++++++-- include/uapi/linux/fs.h | 4 +++ 3 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 5a157dadea0b..840f820fb467 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -2400,6 +2400,10 @@ will use the calling process's active pid namespace. Note that the pid namespace of an existing procfs instance cannot be modified (attempting to do so will give an `-EBUSY` error).
+Processes can check which pid namespace is used by a procfs instance by using +the `PROCFS_GET_PID_NAMESPACE` ioctl() on the root directory of the procfs +instance. + Chapter 5: Filesystem behavior ==============================
diff --git a/fs/proc/root.c b/fs/proc/root.c index fd1f1c8a939a..ac9b115fad7b 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -23,8 +23,10 @@ #include <linux/cred.h> #include <linux/magic.h> #include <linux/slab.h> +#include <linux/ptrace.h>
#include "internal.h" +#include "../internal.h"
struct proc_fs_context { struct pid_namespace *pid_ns; @@ -426,15 +428,77 @@ static int proc_root_readdir(struct file *file, struct dir_context *ctx) return proc_pid_readdir(file, ctx); }
+static long int proc_root_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + switch (cmd) { + case PROCFS_GET_PID_NAMESPACE: { +#ifdef CONFIG_PID_NS + struct pid_namespace *active = task_active_pid_ns(current); + struct pid_namespace *ns = proc_pid_ns(file_inode(filp)->i_sb); + bool can_access_pidns = false; + + /* + * Having a handle to a pidns is not sufficient to do anything + * particularly harmful, as setns(2) has its own separate + * privilege checks. So, we can loosen the privilege + * requirements here a little to make this more ergonomic. + * + * If we are in an ancestor pidns of the pidns, then we can + * already address any process in the pidns. From a setns(2) + * privileges perspective, we can create a pidfd which setns(2) + * would also accept (pending any privilege checks). + * + * If we are not in an ancestor pidns, because this operation + * is being done on the root of the /proc instance, the caller + * can try to access /proc/1/ns/pid which is equivalent to this + * ioctl and so we should copy the PTRACE_MODE_READ_FSCREDS + * permission model use by proc_ns_get_link(). Ideally we would + * check for ptrace-read access against all processes in the + * pidns (which is very likely to be true for at least one + * process, as SUID_DUMP_DISABLE is cleared on exec(2) and is + * rarely set by most programs), but this would obviously not + * scale. + * + * If there is no root process, then there is no real downside + * to unprivileged users to open a handle to it. + */ + can_access_pidns = pidns_is_ancestor(ns, active); + if (!can_access_pidns) { + bool cannot_ptrace_pid1 = false; + + read_lock(&tasklist_lock); + if (ns->child_reaper) + cannot_ptrace_pid1 = ptrace_may_access(ns->child_reaper, + PTRACE_MODE_READ_FSCREDS); + read_unlock(&tasklist_lock); + can_access_pidns = !cannot_ptrace_pid1; + } + if (!can_access_pidns) + return -EPERM; + + /* open_namespace() unconditionally consumes the reference. */ + get_pid_ns(ns); + return open_namespace(to_ns_common(ns)); +#else + return -EOPNOTSUPP; +#endif + } + default: + return -ENOIOCTLCMD; + } +} + /* * The root /proc directory is special, as it has the * <pid> directories. Thus we don't use the generic * directory handling functions for that.. */ static const struct file_operations proc_root_operations = { - .read = generic_read_dir, - .iterate_shared = proc_root_readdir, + .read = generic_read_dir, + .iterate_shared = proc_root_readdir, .llseek = generic_file_llseek, + .unlocked_ioctl = proc_root_ioctl, + .compat_ioctl = compat_ptr_ioctl, };
/* diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 0bd678a4a10e..68e65e6d7d6b 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -435,8 +435,12 @@ typedef int __bitwise __kernel_rwf_t; RWF_APPEND | RWF_NOAPPEND | RWF_ATOMIC |\ RWF_DONTCACHE)
+/* This matches XSDFEC_MAGIC, so we need to allocate subvalues carefully. */ #define PROCFS_IOCTL_MAGIC 'f'
+/* procfs root ioctls */ +#define PROCFS_GET_PID_NAMESPACE _IO(PROCFS_IOCTL_MAGIC, 32) + /* Pagemap ioctl */ #define PAGEMAP_SCAN _IOWR(PROCFS_IOCTL_MAGIC, 16, struct pm_scan_arg)