1 files changed, 7 insertions, 5 deletions

diff --git a/kernel/utsname.c b/kernel/utsname.c
index 160c8c5136bd..9d8180a0f0d8 100644
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -13,6 +13,7 @@
 #include <linux/uts.h>
 #include <linux/utsname.h>
 #include <linux/version.h>
+#include <linux/err.h>
 
 /*
  * Clone a new ns copying an original utsname, setting refcount to 1
@@ -24,10 +25,11 @@ 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);
-        }
+        if (!ns)
+                return ERR_PTR(-ENOMEM);
+
+        memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
+        kref_init(&ns->kref);
         return ns;
 }
 
@@ -37,7 +39,7 @@ static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns)
  * utsname of this process won't be seen by parent, and vice
  * versa.
  */
-struct uts_namespace *copy_utsname(int flags, struct uts_namespace *old_ns)
+struct uts_namespace *copy_utsname(unsigned long flags, struct uts_namespace *old_ns)
 {
         struct uts_namespace *new_ns;