Commit:     626ac545c12e5f9bffe93086d1d03d26c99987ea
Parent:     9550b105b8646f916862aee3ab7b25020ca14159
Author:     Serge E. Hallyn <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 17 15:28:17 2007 -0400
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Jul 19 14:05:08 2007 -0700

    user namespace: fix copy_user_ns return value
    When a CONFIG_USER_NS=n and a user tries to unshare some namespace other
    than the user namespace, the dummy copy_user_ns returns NULL rather than
    the old_ns.
    This value then gets assigned to task->nsproxy->user_ns, so that a
    subsequent setuid, which uses task->nsproxy->user_ns, causes a NULL
    pointer deref.
    Fix this by returning old_ns.
    Signed-off-by: Serge E. Hallyn <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/linux/user_namespace.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index bb32057..1101b0c 100644
--- 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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to