Pull bugzilla-7880 into release branch

[cascardo/linux.git] / include / linux / user_namespace.h

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index bb32057..1101b0c 100644 (file)
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -49,7 +49,7 @@ static inline struct user_namespace *copy_user_ns(int flags,
        if (flags & CLONE_NEWUSER)
                return ERR_PTR(-EINVAL);
 
-       return NULL;
+       return old_ns;
 }
 
 static inline void put_user_ns(struct user_namespace *ns)