Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[powerpc.git] / kernel / utsname.c

diff --git a/kernel/utsname.c b/kernel/utsname.c
index 1824384..160c8c5 100644 (file)
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -14,23 +14,43 @@
 #include <linux/utsname.h>
 #include <linux/version.h>
 
+/*
+ * Clone a new ns copying an original utsname, setting refcount to 1
+ * @old_ns: namespace to clone
+ * Return NULL on error (failure to kmalloc), new ns otherwise
+ */
+static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns)
+{
+       struct uts_namespace *ns;
+
+       ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
+       if (ns) {
+               memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
+               kref_init(&ns->kref);
+       }
+       return ns;
+}
+
 /*
  * Copy task tsk's utsname namespace, or clone it if flags
  * specifies CLONE_NEWUTS.  In latter case, changes to the
  * utsname of this process won't be seen by parent, and vice
  * versa.
  */
-int copy_utsname(int flags, struct task_struct *tsk)
+struct uts_namespace *copy_utsname(int flags, struct uts_namespace *old_ns)
 {
-       struct uts_namespace *old_ns = tsk->nsproxy->uts_ns;
-       int err = 0;
-
-       if (!old_ns)
-               return 0;
+       struct uts_namespace *new_ns;
 
+       BUG_ON(!old_ns);
        get_uts_ns(old_ns);
 
-       return err;
+       if (!(flags & CLONE_NEWUTS))
+               return old_ns;
+
+       new_ns = clone_uts_ns(old_ns);
+
+       put_uts_ns(old_ns);
+       return new_ns;
 }
 
 void free_uts_ns(struct kref *kref)