Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / kernel / user_namespace.c

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 89a27e8b17fbe08084408562e4da57ab5dd688c8..d055d987850cc96ed2a73cc36d064b15d552dcaf 100644 (file)
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -34,7 +34,7 @@ static struct user_namespace *clone_user_ns(struct user_namespace *old_ns)
 
        ns = kmalloc(sizeof(struct user_namespace), GFP_KERNEL);
        if (!ns)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        kref_init(&ns->kref);
 
@@ -45,7 +45,7 @@ static struct user_namespace *clone_user_ns(struct user_namespace *old_ns)
        ns->root_user = alloc_uid(ns, 0);
        if (!ns->root_user) {
                kfree(ns);
-               return NULL;
+               return ERR_PTR(-ENOMEM);
        }
 
        /* Reset current->user with a new one */
@@ -53,7 +53,7 @@ static struct user_namespace *clone_user_ns(struct user_namespace *old_ns)
        if (!new_user) {
                free_uid(ns->root_user);
                kfree(ns);
-               return NULL;
+               return ERR_PTR(-ENOMEM);
        }
 
        switch_uid(new_user);