Skip to content

Commit 6160968

Browse files
oleg-nesterovtorvalds
authored andcommitted
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: [email protected] Signed-off-by: Oleg Nesterov <[email protected]> Reviewed-by: Andy Lutomirski <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent c095ba7 commit 6160968

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

kernel/user_namespace.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,21 @@ int create_user_ns(struct cred *new)
105105
int unshare_userns(unsigned long unshare_flags, struct cred **new_cred)
106106
{
107107
struct cred *cred;
108+
int err = -ENOMEM;
108109

109110
if (!(unshare_flags & CLONE_NEWUSER))
110111
return 0;
111112

112113
cred = prepare_creds();
113-
if (!cred)
114-
return -ENOMEM;
114+
if (cred) {
115+
err = create_user_ns(cred);
116+
if (err)
117+
put_cred(cred);
118+
else
119+
*new_cred = cred;
120+
}
115121

116-
*new_cred = cred;
117-
return create_user_ns(cred);
122+
return err;
118123
}
119124

120125
void free_user_ns(struct user_namespace *ns)

0 commit comments

Comments
 (0)