From d2491e6ca6e69d2a09e3bfb034a54df2d47967b0 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sun, 7 Mar 2010 18:48:39 -0800
Subject: [PATCH] --- yaml --- r: 251669 b: refs/heads/master c:
 a00eaf11a223c63fbb212369d6db69ce4c55a2d1 h: refs/heads/master i:   251667:
 33c96e422ede544c9a6ea1af62eb330011845913 v: v3

---
 [refs]                        |  2 +-
 trunk/fs/proc/namespaces.c    |  3 +++
 trunk/include/linux/proc_fs.h |  1 +
 trunk/ipc/namespace.c         | 37 +++++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8c257252dac2..5060a6f5d40b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34482e89a5218f0f9317abf1cfba3bb38b5c29dd
+refs/heads/master: a00eaf11a223c63fbb212369d6db69ce4c55a2d1
diff --git a/trunk/fs/proc/namespaces.c b/trunk/fs/proc/namespaces.c
index b017181f1273..f18d6d58bf79 100644
--- a/trunk/fs/proc/namespaces.c
+++ b/trunk/fs/proc/namespaces.c
@@ -22,6 +22,9 @@ static const struct proc_ns_operations *ns_entries[] = {
 #ifdef CONFIG_UTS_NS
 	&utsns_operations,
 #endif
+#ifdef CONFIG_IPC_NS
+	&ipcns_operations,
+#endif
 };
 
 static const struct file_operations ns_file_operations = {
diff --git a/trunk/include/linux/proc_fs.h b/trunk/include/linux/proc_fs.h
index 52aa89df8a6d..a23f0b72a023 100644
--- a/trunk/include/linux/proc_fs.h
+++ b/trunk/include/linux/proc_fs.h
@@ -267,6 +267,7 @@ struct proc_ns_operations {
 };
 extern const struct proc_ns_operations netns_operations;
 extern const struct proc_ns_operations utsns_operations;
+extern const struct proc_ns_operations ipcns_operations;
 
 union proc_op {
 	int (*proc_get_link)(struct inode *, struct path *);
diff --git a/trunk/ipc/namespace.c b/trunk/ipc/namespace.c
index 8054c8e5faf1..ce0a647869b1 100644
--- a/trunk/ipc/namespace.c
+++ b/trunk/ipc/namespace.c
@@ -12,6 +12,7 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/user_namespace.h>
+#include <linux/proc_fs.h>
 
 #include "util.h"
 
@@ -140,3 +141,39 @@ void put_ipc_ns(struct ipc_namespace *ns)
 		free_ipc_ns(ns);
 	}
 }
+
+static void *ipcns_get(struct task_struct *task)
+{
+	struct ipc_namespace *ns = NULL;
+	struct nsproxy *nsproxy;
+
+	rcu_read_lock();
+	nsproxy = task_nsproxy(task);
+	if (nsproxy)
+		ns = get_ipc_ns(nsproxy->ipc_ns);
+	rcu_read_unlock();
+
+	return ns;
+}
+
+static void ipcns_put(void *ns)
+{
+	return put_ipc_ns(ns);
+}
+
+static int ipcns_install(struct nsproxy *nsproxy, void *ns)
+{
+	/* Ditch state from the old ipc namespace */
+	exit_sem(current);
+	put_ipc_ns(nsproxy->ipc_ns);
+	nsproxy->ipc_ns = get_ipc_ns(ns);
+	return 0;
+}
+
+const struct proc_ns_operations ipcns_operations = {
+	.name		= "ipc",
+	.type		= CLONE_NEWIPC,
+	.get		= ipcns_get,
+	.put		= ipcns_put,
+	.install	= ipcns_install,
+};