Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bb80f24 authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

proc: Split the namespace stuff out into linux/proc_ns.h 



Split the proc namespace stuff out into linux/proc_ns.h.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: netdev@vger.kernel.org
cc: Serge E. Hallyn <serge.hallyn@ubuntu.com>
cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c3bef7bc

fs/namespace.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/fs_struct.h>	/* get_fs_root et.al. */

#include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */

#include <linux/uaccess.h>

#include <linux/proc_fs.h>

#include <linux/proc_ns.h>

#include "pnode.h"

#include "internal.h"
@@ -1350,13 +1350,13 @@ static bool mnt_ns_loop(struct path *path) 
	 * mount namespace loop?

	 */

	struct inode *inode = path->dentry->d_inode;

	struct proc_inode *ei;

	struct proc_ns *ei;

	struct mnt_namespace *mnt_ns;



	if (!proc_ns_inode(inode))

		return false;



	ei = PROC_I(inode);

	ei = get_proc_ns(inode);

	if (ei->ns_ops != &mntns_operations)

		return false;

fs/proc/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ static void proc_evict_inode(struct inode *inode) 
		sysctl_head_put(head);

	}

	/* Release any associated namespace */

	ns_ops = PROC_I(inode)->ns_ops;

	ns = PROC_I(inode)->ns;

	ns_ops = PROC_I(inode)->ns.ns_ops;

	ns = PROC_I(inode)->ns.ns;

	if (ns_ops && ns)

		ns_ops->put(ns);

}
@@ -73,8 +73,8 @@ static struct inode *proc_alloc_inode(struct super_block *sb) 
	ei->pde = NULL;

	ei->sysctl = NULL;

	ei->sysctl_entry = NULL;

	ei->ns = NULL;

	ei->ns_ops = NULL;

	ei->ns.ns = NULL;

	ei->ns.ns_ops = NULL;

	inode = &ei->vfs_inode;

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;

	return inode;

fs/proc/namespaces.c

+11 −6
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int ns_delete_dentry(const struct dentry *dentry) 
static char *ns_dname(struct dentry *dentry, char *buffer, int buflen)

{

	struct inode *inode = dentry->d_inode;

	const struct proc_ns_operations *ns_ops = PROC_I(inode)->ns_ops;

	const struct proc_ns_operations *ns_ops = PROC_I(inode)->ns.ns_ops;



	return dynamic_dname(dentry, buffer, buflen, "%s:[%lu]",

		ns_ops->name, inode->i_ino);
@@ -95,8 +95,8 @@ static struct dentry *proc_ns_get_dentry(struct super_block *sb, 
		inode->i_op = &ns_inode_operations;

		inode->i_mode = S_IFREG | S_IRUGO;

		inode->i_fop = &ns_file_operations;

		ei->ns_ops = ns_ops;

		ei->ns = ns;

		ei->ns.ns_ops = ns_ops;

		ei->ns.ns = ns;

		unlock_new_inode(inode);

	} else {

		ns_ops->put(ns);
@@ -128,7 +128,7 @@ static void *proc_ns_follow_link(struct dentry *dentry, struct nameidata *nd) 
	if (!ptrace_may_access(task, PTRACE_MODE_READ))

		goto out_put_task;



	ns_path.dentry = proc_ns_get_dentry(sb, task, ei->ns_ops);

	ns_path.dentry = proc_ns_get_dentry(sb, task, ei->ns.ns_ops);

	if (IS_ERR(ns_path.dentry)) {

		error = ERR_CAST(ns_path.dentry);

		goto out_put_task;
@@ -148,7 +148,7 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl 
{

	struct inode *inode = dentry->d_inode;

	struct proc_inode *ei = PROC_I(inode);

	const struct proc_ns_operations *ns_ops = ei->ns_ops;

	const struct proc_ns_operations *ns_ops = ei->ns.ns_ops;

	struct task_struct *task;

	void *ns;

	char name[50];
@@ -202,7 +202,7 @@ static struct dentry *proc_ns_instantiate(struct inode *dir, 
	ei = PROC_I(inode);

	inode->i_mode = S_IFLNK|S_IRWXUGO;

	inode->i_op = &proc_ns_link_inode_operations;

	ei->ns_ops = ns_ops;

	ei->ns.ns_ops = ns_ops;



	d_set_d_op(dentry, &pid_dentry_operations);

	d_add(dentry, inode);
@@ -337,6 +337,11 @@ struct file *proc_ns_fget(int fd) 
	return ERR_PTR(-EINVAL);

}



struct proc_ns *get_proc_ns(struct inode *inode)

{

	return &PROC_I(inode)->ns;

}



bool proc_ns_inode(struct inode *inode)

{

	return inode->i_fop == &ns_file_operations;

include/linux/proc_fs.h

+2 −66
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/spinlock.h>

#include <linux/magic.h>

#include <linux/atomic.h>

#include <linux/proc_ns.h>



struct net;

struct completion;
@@ -23,18 +24,6 @@ struct mm_struct; 
/* Worst case buffer size needed for holding an integer. */

#define PROC_NUMBUF 13



/*

 * 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,

};



/*

 * This is not completely implemented yet. The idea is to

 * create an in-memory tree (like the actual /proc filesystem
@@ -81,10 +70,6 @@ struct proc_dir_entry *proc_create_data(const char *name, umode_t mode, 
extern void remove_proc_entry(const char *name, struct proc_dir_entry *parent);

extern int remove_proc_subtree(const char *name, struct proc_dir_entry *parent);



struct pid_namespace;



extern int pid_ns_prepare_proc(struct pid_namespace *ns);

extern void pid_ns_release_proc(struct pid_namespace *ns);



/*

 * proc_tty.c
@@ -132,12 +117,6 @@ extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, 


extern void proc_set_size(struct proc_dir_entry *, loff_t);

extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);



extern struct file *proc_ns_fget(int fd);

extern bool proc_ns_inode(struct inode *inode);



extern int proc_alloc_inum(unsigned int *pino);

extern void proc_free_inum(unsigned int inum);

#else



static inline void proc_flush_task(struct task_struct *task)
@@ -168,50 +147,8 @@ struct tty_driver; 
static inline void proc_tty_register_driver(struct tty_driver *driver) {};

static inline void proc_tty_unregister_driver(struct tty_driver *driver) {};



static inline int pid_ns_prepare_proc(struct pid_namespace *ns)

{

	return 0;

}



static inline void pid_ns_release_proc(struct pid_namespace *ns)

{

}



static inline struct file *proc_ns_fget(int fd)

{

	return ERR_PTR(-EINVAL);

}



static inline bool proc_ns_inode(struct inode *inode)

{

	return false;

}



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 */



struct nsproxy;

struct proc_ns_operations {

	const char *name;

	int type;

	void *(*get)(struct task_struct *task);

	void (*put)(void *ns);

	int (*install)(struct nsproxy *nsproxy, void *ns);

	unsigned int (*inum)(void *ns);

};

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 userns_operations;

extern const struct proc_ns_operations mntns_operations;



union proc_op {

	int (*proc_get_link)(struct dentry *, struct path *);
@@ -231,8 +168,7 @@ struct proc_inode { 
	struct proc_dir_entry *pde;

	struct ctl_table_header *sysctl;

	struct ctl_table *sysctl_entry;

	void *ns;

	const struct proc_ns_operations *ns_ops;

	struct proc_ns ns;

	struct inode vfs_inode;

};

include/linux/proc_ns.h

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * procfs namespace bits

 */

#ifndef _LINUX_PROC_NS_H

#define _LINUX_PROC_NS_H



struct pid_namespace;

struct nsproxy;



struct proc_ns_operations {

	const char *name;

	int type;

	void *(*get)(struct task_struct *task);

	void (*put)(void *ns);

	int (*install)(struct nsproxy *nsproxy, void *ns);

	unsigned int (*inum)(void *ns);

};



struct proc_ns {

	void *ns;

	const struct proc_ns_operations *ns_ops;

};



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 userns_operations;

extern const struct proc_ns_operations mntns_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,

};



#ifdef CONFIG_PROC_FS



extern int pid_ns_prepare_proc(struct pid_namespace *ns);

extern void pid_ns_release_proc(struct pid_namespace *ns);

extern struct file *proc_ns_fget(int fd);

extern struct proc_ns *get_proc_ns(struct inode *);

extern int proc_alloc_inum(unsigned int *pino);

extern void proc_free_inum(unsigned int inum);

extern bool proc_ns_inode(struct inode *inode);



#else /* CONFIG_PROC_FS */



static inline int pid_ns_prepare_proc(struct pid_namespace *ns) { return 0; }

static inline void pid_ns_release_proc(struct pid_namespace *ns) {}



static inline struct file *proc_ns_fget(int fd)

{

	return ERR_PTR(-EINVAL);

}



static inline struct proc_ns *get_proc_ns(struct inode *inode) { return NULL; }



static inline int proc_alloc_inum(unsigned int *inum)

{

	*inum = 1;

	return 0;

}

static inline void proc_free_inum(unsigned int inum) {}

static inline bool proc_ns_inode(struct inode *inode) { return false; }



#endif /* CONFIG_PROC_FS */



#endif /* _LINUX_PROC_NS_H */