git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/numa' into x86/urgent
[pandora-kernel.git]
/
kernel
/
user.c
diff --git
a/kernel/user.c
b/kernel/user.c
index
2c7d8d5
..
5c598ca
100644
(file)
--- a/
kernel/user.c
+++ b/
kernel/user.c
@@
-158,6
+158,7
@@
struct user_struct *alloc_uid(struct user_namespace *ns, uid_t uid)
spin_lock_irq(&uidhash_lock);
up = uid_hash_find(uid, hashent);
if (up) {
+ put_user_ns(ns);
key_put(new->uid_keyring);
key_put(new->session_keyring);
kmem_cache_free(uid_cachep, new);