69879c01a0
There remains no more code in the kernel using pids_ns->proc_mnt,
therefore remove it from the kernel.
The big benefit of this change is that one of the most error prone and
tricky parts of the pid namespace implementation, maintaining kernel
mounts of proc is removed.
In addition removing the unnecessary complexity of the kernel mount
fixes a regression that caused the proc mount options to be ignored.
Now that the initial mount of proc comes from userspace, those mount
options are again honored. This fixes Android's usage of the proc
hidepid option.
Reported-by: Alistair Strachan <astrachan@google.com>
Fixes: e94591d0d9 ("proc: Convert proc_mount to use mount_ns.")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
88 lines
2.5 KiB
C
88 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* procfs namespace bits
|
|
*/
|
|
#ifndef _LINUX_PROC_NS_H
|
|
#define _LINUX_PROC_NS_H
|
|
|
|
#include <linux/ns_common.h>
|
|
|
|
struct pid_namespace;
|
|
struct nsproxy;
|
|
struct path;
|
|
struct task_struct;
|
|
struct inode;
|
|
|
|
struct proc_ns_operations {
|
|
const char *name;
|
|
const char *real_ns_name;
|
|
int type;
|
|
struct ns_common *(*get)(struct task_struct *task);
|
|
void (*put)(struct ns_common *ns);
|
|
int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
|
|
struct user_namespace *(*owner)(struct ns_common *ns);
|
|
struct ns_common *(*get_parent)(struct ns_common *ns);
|
|
} __randomize_layout;
|
|
|
|
extern const struct proc_ns_operations netns_operations;
|
|
extern const struct proc_ns_operations utsns_operations;
|
|
extern const struct proc_ns_operations ipcns_operations;
|
|
extern const struct proc_ns_operations pidns_operations;
|
|
extern const struct proc_ns_operations pidns_for_children_operations;
|
|
extern const struct proc_ns_operations userns_operations;
|
|
extern const struct proc_ns_operations mntns_operations;
|
|
extern const struct proc_ns_operations cgroupns_operations;
|
|
extern const struct proc_ns_operations timens_operations;
|
|
extern const struct proc_ns_operations timens_for_children_operations;
|
|
|
|
/*
|
|
* We always define these enumerators
|
|
*/
|
|
enum {
|
|
PROC_ROOT_INO = 1,
|
|
PROC_IPC_INIT_INO = 0xEFFFFFFFU,
|
|
PROC_UTS_INIT_INO = 0xEFFFFFFEU,
|
|
PROC_USER_INIT_INO = 0xEFFFFFFDU,
|
|
PROC_PID_INIT_INO = 0xEFFFFFFCU,
|
|
PROC_CGROUP_INIT_INO = 0xEFFFFFFBU,
|
|
PROC_TIME_INIT_INO = 0xEFFFFFFAU,
|
|
};
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
|
|
extern int proc_alloc_inum(unsigned int *pino);
|
|
extern void proc_free_inum(unsigned int inum);
|
|
|
|
#else /* CONFIG_PROC_FS */
|
|
|
|
static inline int proc_alloc_inum(unsigned int *inum)
|
|
{
|
|
*inum = 1;
|
|
return 0;
|
|
}
|
|
static inline void proc_free_inum(unsigned int inum) {}
|
|
|
|
#endif /* CONFIG_PROC_FS */
|
|
|
|
static inline int ns_alloc_inum(struct ns_common *ns)
|
|
{
|
|
atomic_long_set(&ns->stashed, 0);
|
|
return proc_alloc_inum(&ns->inum);
|
|
}
|
|
|
|
#define ns_free_inum(ns) proc_free_inum((ns)->inum)
|
|
|
|
extern struct file *proc_ns_fget(int fd);
|
|
#define get_proc_ns(inode) ((struct ns_common *)(inode)->i_private)
|
|
extern int ns_get_path(struct path *path, struct task_struct *task,
|
|
const struct proc_ns_operations *ns_ops);
|
|
typedef struct ns_common *ns_get_path_helper_t(void *);
|
|
extern int ns_get_path_cb(struct path *path, ns_get_path_helper_t ns_get_cb,
|
|
void *private_data);
|
|
|
|
extern int ns_get_name(char *buf, size_t size, struct task_struct *task,
|
|
const struct proc_ns_operations *ns_ops);
|
|
extern void nsfs_init(void);
|
|
|
|
#endif /* _LINUX_PROC_NS_H */
|