Commit 6160968c authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

userns: unshare_userns(&cred) should not populate cred on failure

unshare_userns(new_cred) does *new_cred = prepare_creds() before
create_user_ns() which can fail. However, the caller expects that
it doesn't need to take care of new_cred if unshare_userns() fails.

We could change the single caller, sys_unshare(), but I think it
would be more clean to avoid the side effects on failure, so with
this patch unshare_userns() does put_cred() itself and initializes
*new_cred only if create_user_ns() succeeeds.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Reviewed-by: default avatarAndy Lutomirski <luto@amacapital.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c095ba72
...@@ -105,16 +105,21 @@ int create_user_ns(struct cred *new) ...@@ -105,16 +105,21 @@ int create_user_ns(struct cred *new)
int unshare_userns(unsigned long unshare_flags, struct cred **new_cred) int unshare_userns(unsigned long unshare_flags, struct cred **new_cred)
{ {
struct cred *cred; struct cred *cred;
int err = -ENOMEM;
if (!(unshare_flags & CLONE_NEWUSER)) if (!(unshare_flags & CLONE_NEWUSER))
return 0; return 0;
cred = prepare_creds(); cred = prepare_creds();
if (!cred) if (cred) {
return -ENOMEM; err = create_user_ns(cred);
if (err)
put_cred(cred);
else
*new_cred = cred; *new_cred = cred;
return create_user_ns(cred); }
return err;
} }
void free_user_ns(struct user_namespace *ns) void free_user_ns(struct user_namespace *ns)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment