Fix user namespace exiting OOPs

It turned out, that the user namespace is released during the do_exit() in
exit_task_namespaces(), but the struct user_struct is released only during the
put_task_struct(), i.e. MUCH later.

On debug kernels with poisoned slabs this will cause the oops in
uid_hash_remove() because the head of the chain, which resides inside the
struct user_namespace, will be already freed and poisoned.

Since the uid hash itself is required only when someone can search it, i.e.
when the namespace is alive, we can safely unhash all the user_struct-s from
it during the namespace exiting. The subsequent free_uid() will complete the
user_struct destruction.

For example simple program

#include <sched.h>

char stack[2 * 1024 * 1024];

int f(void *foo)
{
return 0;
}

int main(void)
{
clone(f, stack + 1 * 1024 * 1024, 0x10000000, 0);
return 0;
}

run on kernel with CONFIG_USER_NS turned on will oops the
kernel immediately.

This was spotted during OpenVZ kernel testing.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Acked-by: "Serge E. Hallyn" <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Pavel Emelyanov and committed by Linus Torvalds 28f300d2 735de223

+27 -2
+1
include/linux/sched.h
··· 1472 } 1473 extern void free_uid(struct user_struct *); 1474 extern void switch_uid(struct user_struct *); 1475 1476 #include <asm/current.h> 1477
··· 1472 } 1473 extern void free_uid(struct user_struct *); 1474 extern void switch_uid(struct user_struct *); 1475 + extern void release_uids(struct user_namespace *ns); 1476 1477 #include <asm/current.h> 1478
+25 -1
kernel/user.c
··· 62 63 static inline void uid_hash_remove(struct user_struct *up) 64 { 65 - hlist_del(&up->uidhash_node); 66 } 67 68 static inline struct user_struct *uid_hash_find(uid_t uid, struct hlist_head *hashent) ··· 199 suid_keys(current); 200 } 201 202 203 static int __init uid_cache_init(void) 204 {
··· 62 63 static inline void uid_hash_remove(struct user_struct *up) 64 { 65 + hlist_del_init(&up->uidhash_node); 66 } 67 68 static inline struct user_struct *uid_hash_find(uid_t uid, struct hlist_head *hashent) ··· 199 suid_keys(current); 200 } 201 202 + void release_uids(struct user_namespace *ns) 203 + { 204 + int i; 205 + unsigned long flags; 206 + struct hlist_head *head; 207 + struct hlist_node *nd; 208 + 209 + spin_lock_irqsave(&uidhash_lock, flags); 210 + /* 211 + * collapse the chains so that the user_struct-s will 212 + * be still alive, but not in hashes. subsequent free_uid() 213 + * will free them. 214 + */ 215 + for (i = 0; i < UIDHASH_SZ; i++) { 216 + head = ns->uidhash_table + i; 217 + while (!hlist_empty(head)) { 218 + nd = head->first; 219 + hlist_del_init(nd); 220 + } 221 + } 222 + spin_unlock_irqrestore(&uidhash_lock, flags); 223 + 224 + free_uid(ns->root_user); 225 + } 226 227 static int __init uid_cache_init(void) 228 {
+1 -1
kernel/user_namespace.c
··· 81 struct user_namespace *ns; 82 83 ns = container_of(kref, struct user_namespace, kref); 84 - free_uid(ns->root_user); 85 kfree(ns); 86 } 87
··· 81 struct user_namespace *ns; 82 83 ns = container_of(kref, struct user_namespace, kref); 84 + release_uids(ns); 85 kfree(ns); 86 } 87