[RH7,17/32] copy address of proc_ns_ops into ns_common

Submitted by Pavel Tikhomirov on June 8, 2020, 5:05 p.m.

Details

Message ID 20200608170602.308872-18-ptikhomirov@virtuozzo.com
State New
Series "port nsfs from vz8"
Headers show

Commit Message

Pavel Tikhomirov June 8, 2020, 5:05 p.m.
From: Al Viro <viro@zeniv.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

(cherry picked from VZ8 commit 33c429405a2c8d9e42afb9fee88a63cfb2de1e98)

https://jira.sw.ru/browse/PSBM-102357

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 fs/namespace.c            | 1 +
 fs/proc/inode.c           | 6 ++----
 include/linux/ns_common.h | 3 +++
 init/version.c            | 3 +++
 ipc/msgutil.c             | 3 +++
 ipc/namespace.c           | 1 +
 kernel/nsproxy.c          | 8 ++++----
 kernel/pid.c              | 3 +++
 kernel/pid_namespace.c    | 1 +
 kernel/user.c             | 3 +++
 kernel/user_namespace.c   | 1 +
 kernel/utsname.c          | 2 ++
 net/core/net_namespace.c  | 9 +++++++--
 13 files changed, 34 insertions(+), 10 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/namespace.c b/fs/namespace.c
index 6a6d9ccf3bde..7cbc7c13a58e 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3291,6 +3291,7 @@  static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
 		dec_mnt_namespaces(ucounts);
 		return ERR_PTR(ret);
 	}
+	new_ns->ns.ops = &mntns_operations;
 	new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
 	atomic_set(&new_ns->count, 1);
 	new_ns->root = NULL;
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 8b0445574fe7..8918cf3060a8 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -32,7 +32,6 @@  static void proc_evict_inode(struct inode *inode)
 {
 	struct proc_dir_entry *de;
 	struct ctl_table_header *head;
-	const struct proc_ns_operations *ns_ops;
 	struct ns_common *ns;
 
 	truncate_inode_pages_final(&inode->i_data);
@@ -52,10 +51,9 @@  static void proc_evict_inode(struct inode *inode)
 		proc_sys_evict_inode(inode, head);
 	}
 	/* Release any associated namespace */
-	ns_ops = PROC_I(inode)->ns.ns_ops;
 	ns = PROC_I(inode)->ns.ns;
-	if (ns_ops && ns)
-		ns_ops->put(ns);
+	if (ns && ns->ops)
+		ns->ops->put(ns);
 }
 
 static struct kmem_cache * proc_inode_cachep;
diff --git a/include/linux/ns_common.h b/include/linux/ns_common.h
index e7db1cd54047..ce23cf4bbe69 100644
--- a/include/linux/ns_common.h
+++ b/include/linux/ns_common.h
@@ -1,7 +1,10 @@ 
 #ifndef _LINUX_NS_COMMON_H
 #define _LINUX_NS_COMMON_H
 
+struct proc_ns_operations;
+
 struct ns_common {
+	const struct proc_ns_operations *ops;
 	unsigned int inum;
 };
 
diff --git a/init/version.c b/init/version.c
index 200bf28894e6..a63d3300705f 100644
--- a/init/version.c
+++ b/init/version.c
@@ -37,6 +37,9 @@  struct uts_namespace init_uts_ns = {
 	},
 	.user_ns = &init_user_ns,
 	.ns.inum = PROC_UTS_INIT_INO,
+#ifdef CONFIG_UTS_NS
+	.ns.ops = &utsns_operations,
+#endif
 };
 EXPORT_SYMBOL_GPL(init_uts_ns);
 
diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index ac4d7fba7e41..ba6cc040a5ce 100644
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -32,6 +32,9 @@  struct ipc_namespace init_ipc_ns = {
 	.count		= ATOMIC_INIT(1),
 	.user_ns = &init_user_ns,
 	.ns.inum = PROC_IPC_INIT_INO,
+#ifdef CONFIG_IPC_NS
+	.ns.ops = &ipcns_operations,
+#endif
 };
 
 atomic_t nr_ipc_ns = ATOMIC_INIT(1);
diff --git a/ipc/namespace.c b/ipc/namespace.c
index d3002af16e68..c8de38b0ee45 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -46,6 +46,7 @@  static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
 	err = ns_alloc_inum(&ns->ns);
 	if (err)
 		goto fail_free;
+	ns->ns.ops = &ipcns_operations;
 
 	atomic_set(&ns->count, 1);
 	ns->user_ns = get_user_ns(user_ns);
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index dad670ef3869..833bba54e784 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -232,11 +232,11 @@  void exit_task_namespaces(struct task_struct *p)
 
 SYSCALL_DEFINE2(setns, int, fd, int, nstype)
 {
-	const struct proc_ns_operations *ops;
 	struct task_struct *tsk = current;
 	struct nsproxy *new_nsproxy;
 	struct proc_ns *ei;
 	struct file *file;
+	struct ns_common *ns;
 	int err;
 
 	file = proc_ns_fget(fd);
@@ -245,8 +245,8 @@  SYSCALL_DEFINE2(setns, int, fd, int, nstype)
 
 	err = -EINVAL;
 	ei = get_proc_ns(file_inode(file));
-	ops = ei->ns_ops;
-	if (nstype && (ops->type != nstype))
+	ns = ei->ns;
+	if (nstype && (ns->ops->type != nstype))
 		goto out;
 
 	new_nsproxy = create_new_namespaces(0, tsk, current_user_ns(), tsk->fs);
@@ -255,7 +255,7 @@  SYSCALL_DEFINE2(setns, int, fd, int, nstype)
 		goto out;
 	}
 
-	err = ops->install(new_nsproxy, ei->ns);
+	err = ns->ops->install(new_nsproxy, ns);
 	if (err) {
 		free_nsproxy(new_nsproxy);
 		goto out;
diff --git a/kernel/pid.c b/kernel/pid.c
index 48c315ff1d8d..47f41dc1f9be 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -77,6 +77,9 @@  struct pid_namespace init_pid_ns = {
 	.child_reaper = &init_task,
 	.user_ns = &init_user_ns,
 	.ns.inum = PROC_PID_INIT_INO,
+#ifdef CONFIG_PID_NS
+	.ns.ops = &pidns_operations,
+#endif
 };
 EXPORT_SYMBOL_GPL(init_pid_ns);
 
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 80030a07b485..da5c2a541f12 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -127,6 +127,7 @@  static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
 	err = ns_alloc_inum(&ns->ns);
 	if (err)
 		goto out_free_map;
+	ns->ns.ops = &pidns_operations;
 
 	kref_init(&ns->kref);
 	ns->level = level;
diff --git a/kernel/user.c b/kernel/user.c
index 88b4eed72286..62c7d79b8cbf 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -51,6 +51,9 @@  struct user_namespace init_user_ns = {
 	.owner = GLOBAL_ROOT_UID,
 	.group = GLOBAL_ROOT_GID,
 	.ns.inum = PROC_USER_INIT_INO,
+#ifdef CONFIG_USER_NS
+	.ns.ops = &userns_operations,
+#endif
 	.flags = USERNS_INIT_FLAGS,
 #ifdef CONFIG_PERSISTENT_KEYRINGS
 	.persistent_keyring_register_sem =
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 6f542333200f..0208d67347b9 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -134,6 +134,7 @@  int create_user_ns(struct cred *new)
 		kmem_cache_free(user_ns_cachep, ns);
 		return -ENOMEM;
 	}
+	ns->ns.ops = &userns_operations;
 
 	free_uid(new->user);
 	new->user = new_user;
diff --git a/kernel/utsname.c b/kernel/utsname.c
index 0ac05ebcb3db..7ead888875b5 100644
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -75,6 +75,8 @@  static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns,
 
 	ns->ucounts = ucounts;
 
+	ns->ns.ops = &utsns_operations;
+
 	down_read(&uts_sem);
 	memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
 	ns->user_ns = get_user_ns(user_ns);
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 73f077d3edd3..88cff01ed897 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -565,6 +565,7 @@  struct net *get_net_ns_by_fd(int fd)
 {
 	struct proc_ns *ei;
 	struct file *file;
+	struct ns_common *ns;
 	struct net *net;
 
 	file = proc_ns_fget(fd);
@@ -572,8 +573,9 @@  struct net *get_net_ns_by_fd(int fd)
 		return ERR_CAST(file);
 
 	ei = get_proc_ns(file_inode(file));
-	if (ei->ns_ops == &netns_operations)
-		net = get_net(container_of(ei->ns, struct net, ns));
+	ns = ei->ns;
+	if (ns->ops == &netns_operations)
+		net = get_net(container_of(ns, struct net, ns));
 	else
 		net = ERR_PTR(-EINVAL);
 
@@ -613,6 +615,9 @@  EXPORT_SYMBOL_GPL(get_net_ns_by_pid);
 
 static __net_init int net_ns_net_init(struct net *net)
 {
+#ifdef CONFIG_NET_NS
+	net->ns.ops = &netns_operations;
+#endif
 	return ns_alloc_inum(&net->ns);
 }