Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[pandora-kernel.git] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 47c1928..f5b9ee6 100644 (file)
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -7,14 +7,19 @@
  *  modify it under the terms of the GNU General Public License as
  *  published by the Free Software Foundation, version 2 of the
  *  License.
+ *
+ *  Jun 2006 - namespaces support
+ *             OpenVZ, SWsoft Inc.
+ *             Pavel Emelianov <xemul@openvz.org>
  */
 
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/nsproxy.h>
 #include <linux/init_task.h>
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/utsname.h>
+#include <linux/pid_namespace.h>
 
 struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
 
@@ -40,11 +45,9 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig)
 {
        struct nsproxy *ns;
 
-       ns = kmalloc(sizeof(struct nsproxy), GFP_KERNEL);
-       if (ns) {
-               memcpy(ns, orig, sizeof(struct nsproxy));
+       ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL);
+       if (ns)
                atomic_set(&ns->count, 1);
-       }
        return ns;
 }
 
@@ -58,10 +61,14 @@ struct nsproxy *dup_namespaces(struct nsproxy *orig)
        struct nsproxy *ns = clone_namespaces(orig);
 
        if (ns) {
-               if (ns->namespace)
-                       get_namespace(ns->namespace);
+               if (ns->mnt_ns)
+                       get_mnt_ns(ns->mnt_ns);
                if (ns->uts_ns)
                        get_uts_ns(ns->uts_ns);
+               if (ns->ipc_ns)
+                       get_ipc_ns(ns->ipc_ns);
+               if (ns->pid_ns)
+                       get_pid_ns(ns->pid_ns);
        }
 
        return ns;
@@ -82,7 +89,7 @@ int copy_namespaces(int flags, struct task_struct *tsk)
 
        get_nsproxy(old_ns);
 
-       if (!(flags & CLONE_NEWNS))
+       if (!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC)))
                return 0;
 
        new_ns = clone_namespaces(old_ns);
@@ -93,32 +100,50 @@ int copy_namespaces(int flags, struct task_struct *tsk)
 
        tsk->nsproxy = new_ns;
 
-       err = copy_namespace(flags, tsk);
-       if (err) {
-               tsk->nsproxy = old_ns;
-               put_nsproxy(new_ns);
-               goto out;
-       }
+       err = copy_mnt_ns(flags, tsk);
+       if (err)
+               goto out_ns;
 
        err = copy_utsname(flags, tsk);
-       if (err) {
-               if (new_ns->namespace)
-                       put_namespace(new_ns->namespace);
-               tsk->nsproxy = old_ns;
-               put_nsproxy(new_ns);
-               goto out;
-       }
+       if (err)
+               goto out_uts;
+
+       err = copy_ipcs(flags, tsk);
+       if (err)
+               goto out_ipc;
+
+       err = copy_pid_ns(flags, tsk);
+       if (err)
+               goto out_pid;
 
 out:
        put_nsproxy(old_ns);
        return err;
+
+out_pid:
+       if (new_ns->ipc_ns)
+               put_ipc_ns(new_ns->ipc_ns);
+out_ipc:
+       if (new_ns->uts_ns)
+               put_uts_ns(new_ns->uts_ns);
+out_uts:
+       if (new_ns->mnt_ns)
+               put_mnt_ns(new_ns->mnt_ns);
+out_ns:
+       tsk->nsproxy = old_ns;
+       kfree(new_ns);
+       goto out;
 }
 
 void free_nsproxy(struct nsproxy *ns)
 {
-               if (ns->namespace)
-                       put_namespace(ns->namespace);
-               if (ns->uts_ns)
-                       put_uts_ns(ns->uts_ns);
-               kfree(ns);
+       if (ns->mnt_ns)
+               put_mnt_ns(ns->mnt_ns);
+       if (ns->uts_ns)
+               put_uts_ns(ns->uts_ns);
+       if (ns->ipc_ns)
+               put_ipc_ns(ns->ipc_ns);
+       if (ns->pid_ns)
+               put_pid_ns(ns->pid_ns);
+       kfree(ns);
 }