diff options
| author | James Morris <jmorris@namei.org> | 2008-11-26 05:26:44 (GMT) |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-26 05:26:44 (GMT) |
| commit | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (patch) | |
| tree | 2492602c6316b654378c3b557e206923956e59f4 /kernel/sys.c | |
| parent | 200036ca9b3f0b2250912142552ce56682190f95 (diff) | |
| parent | 6ded6ab9be4f6164aef1c527407c1b94f0929799 (diff) | |
| download | linux-fsl-qoriq-3496f92beb9aa99ef21fccc154a36c7698e9c538.tar.xz | |
Merge branch 'serge-next' into next
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index ab73504..ebe65c2 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -565,13 +565,13 @@ static int set_user(struct cred *new) { struct user_struct *new_user; - new_user = alloc_uid(current->nsproxy->user_ns, new->uid); + new_user = alloc_uid(current_user_ns(), new->uid); if (!new_user) return -EAGAIN; if (atomic_read(&new_user->processes) >= current->signal->rlim[RLIMIT_NPROC].rlim_cur && - new_user != current->nsproxy->user_ns->root_user) { + new_user != INIT_USER) { free_uid(new_user); return -EAGAIN; } |