Unverified Commit 4055526d authored by Christian Brauner's avatar Christian Brauner
Browse files

ns: move ns type into struct ns_common 



It's misplaced in struct proc_ns_operations and ns->ops might be NULL if
the namespace is compiled out but we still want to know the type of the
namespace for the initial namespace struct.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 10cdfcd3

fs/namespace.c

+3 −3
Original line number Diff line number Diff line
@@ -4927,7 +4927,7 @@ static int build_mount_idmapped(const struct mount_attr *attr, size_t usize, 
		return -EINVAL;



	ns = get_proc_ns(file_inode(fd_file(f)));

	if (ns->ops->type != CLONE_NEWUSER)

	if (ns->ns_type != CLONE_NEWUSER)

		return -EINVAL;



	/*
@@ -5830,7 +5830,7 @@ static struct mnt_namespace *grab_requested_mnt_ns(const struct mnt_id_req *kreq 
			return ERR_PTR(-EINVAL);



		ns = get_proc_ns(file_inode(fd_file(f)));

		if (ns->ops->type != CLONE_NEWNS)

		if (ns->ns_type != CLONE_NEWNS)

			return ERR_PTR(-EINVAL);



		mnt_ns = to_mnt_ns(ns);
@@ -6016,6 +6016,7 @@ struct mnt_namespace init_mnt_ns = { 
	.ns.ops		= &mntns_operations,

	.user_ns	= &init_user_ns,

	.ns.__ns_ref	= REFCOUNT_INIT(1),

	.ns.ns_type	= ns_common_type(&init_mnt_ns),

	.passive	= REFCOUNT_INIT(1),

	.mounts		= RB_ROOT,

	.poll		= __WAIT_QUEUE_HEAD_INITIALIZER(init_mnt_ns.poll),
@@ -6333,7 +6334,6 @@ static struct user_namespace *mntns_owner(struct ns_common *ns) 


const struct proc_ns_operations mntns_operations = {

	.name		= "mnt",

	.type		= CLONE_NEWNS,

	.get		= mntns_get,

	.put		= mntns_put,

	.install	= mntns_install,

fs/nsfs.c

+9 −9
Original line number Diff line number Diff line
@@ -219,9 +219,9 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl, 
			return -EINVAL;

		return open_related_ns(ns, ns->ops->get_parent);

	case NS_GET_NSTYPE:

		return ns->ops->type;

		return ns->ns_type;

	case NS_GET_OWNER_UID:

		if (ns->ops->type != CLONE_NEWUSER)

		if (ns->ns_type != CLONE_NEWUSER)

			return -EINVAL;

		user_ns = container_of(ns, struct user_namespace, ns);

		argp = (uid_t __user *) arg;
@@ -234,7 +234,7 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl, 
	case NS_GET_PID_IN_PIDNS:

		fallthrough;

	case NS_GET_TGID_IN_PIDNS: {

		if (ns->ops->type != CLONE_NEWPID)

		if (ns->ns_type != CLONE_NEWPID)

			return -EINVAL;



		ret = -ESRCH;
@@ -273,7 +273,7 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl, 
		return ret;

	}

	case NS_GET_MNTNS_ID:

		if (ns->ops->type != CLONE_NEWNS)

		if (ns->ns_type != CLONE_NEWNS)

			return -EINVAL;

		fallthrough;

	case NS_GET_ID: {
@@ -293,7 +293,7 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl, 
		struct mnt_ns_info __user *uinfo = (struct mnt_ns_info __user *)arg;

		size_t usize = _IOC_SIZE(ioctl);



		if (ns->ops->type != CLONE_NEWNS)

		if (ns->ns_type != CLONE_NEWNS)

			return -EINVAL;



		if (!uinfo)
@@ -314,7 +314,7 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl, 
		struct file *f __free(fput) = NULL;

		size_t usize = _IOC_SIZE(ioctl);



		if (ns->ops->type != CLONE_NEWNS)

		if (ns->ns_type != CLONE_NEWNS)

			return -EINVAL;



		if (usize < MNT_NS_INFO_SIZE_VER0)
@@ -453,7 +453,7 @@ static int nsfs_encode_fh(struct inode *inode, u32 *fh, int *max_len, 
	}



	fid->ns_id	= ns->ns_id;

	fid->ns_type	= ns->ops->type;

	fid->ns_type	= ns->ns_type;

	fid->ns_inum	= inode->i_ino;

	return FILEID_NSFS;

}
@@ -489,14 +489,14 @@ static struct dentry *nsfs_fh_to_dentry(struct super_block *sb, struct fid *fh, 
			return NULL;



		VFS_WARN_ON_ONCE(ns->ns_id != fid->ns_id);

		VFS_WARN_ON_ONCE(ns->ops->type != fid->ns_type);

		VFS_WARN_ON_ONCE(ns->ns_type != fid->ns_type);

		VFS_WARN_ON_ONCE(ns->inum != fid->ns_inum);



		if (!__ns_ref_get(ns))

			return NULL;

	}



	switch (ns->ops->type) {

	switch (ns->ns_type) {

#ifdef CONFIG_CGROUPS

	case CLONE_NEWCGROUP:

		if (!current_in_namespace(to_cg_ns(ns)))

include/linux/ns_common.h

+25 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include <linux/refcount.h>

#include <linux/rbtree.h>

#include <uapi/linux/sched.h>



struct proc_ns_operations;
@@ -37,6 +38,7 @@ extern const struct proc_ns_operations timens_operations; 
extern const struct proc_ns_operations timens_for_children_operations;



struct ns_common {

	u32 ns_type;

	struct dentry *stashed;

	const struct proc_ns_operations *ops;

	unsigned int inum;
@@ -51,7 +53,7 @@ struct ns_common { 
	};

};



int __ns_common_init(struct ns_common *ns, const struct proc_ns_operations *ops, int inum);

int __ns_common_init(struct ns_common *ns, u32 ns_type, const struct proc_ns_operations *ops, int inum);

void __ns_common_free(struct ns_common *ns);



#define to_ns_common(__ns)                                    \
@@ -106,10 +108,28 @@ void __ns_common_free(struct ns_common *ns); 
		struct user_namespace *:   (IS_ENABLED(CONFIG_USER_NS) ? &userns_operations   : NULL), \

		struct uts_namespace *:    (IS_ENABLED(CONFIG_UTS_NS)  ? &utsns_operations    : NULL))



#define ns_common_init(__ns) \

	__ns_common_init(to_ns_common(__ns), to_ns_operations(__ns), (((__ns) == ns_init_ns(__ns)) ? ns_init_inum(__ns) : 0))

#define ns_common_type(__ns)                                \

	_Generic((__ns),                                    \

		struct cgroup_namespace *: CLONE_NEWCGROUP, \

		struct ipc_namespace *:    CLONE_NEWIPC,    \

		struct mnt_namespace *:    CLONE_NEWNS,     \

		struct net *:              CLONE_NEWNET,    \

		struct pid_namespace *:    CLONE_NEWPID,    \

		struct time_namespace *:   CLONE_NEWTIME,   \

		struct user_namespace *:   CLONE_NEWUSER,   \

		struct uts_namespace *:    CLONE_NEWUTS)



#define ns_common_init_inum(__ns, __inum) __ns_common_init(to_ns_common(__ns), to_ns_operations(__ns), __inum)

#define ns_common_init(__ns)                     \

	__ns_common_init(to_ns_common(__ns),     \

			 ns_common_type(__ns),   \

			 to_ns_operations(__ns), \

			 (((__ns) == ns_init_ns(__ns)) ? ns_init_inum(__ns) : 0))



#define ns_common_init_inum(__ns, __inum)        \

	__ns_common_init(to_ns_common(__ns),     \

			 ns_common_type(__ns),   \

			 to_ns_operations(__ns), \

			 __inum)



#define ns_common_free(__ns) __ns_common_free(to_ns_common((__ns)))

include/linux/proc_ns.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 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 nsset *nsset, struct ns_common *ns);

init/version-timestamp.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/utsname.h>



struct uts_namespace init_uts_ns = {

	.ns.ns_type = ns_common_type(&init_uts_ns),

	.ns.__ns_ref = REFCOUNT_INIT(2),

	.name = {

		.sysname	= UTS_SYSNAME,