aboutsummaryrefslogtreecommitdiff
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-04 11:51:29 +0100
committerIngo Molnar <mingo@elte.hu>2010-03-04 11:51:29 +0100
commite02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch)
tree61b64506b2c016e050f940a89d1ffd36b7c00fdf /kernel/sys.c
parentae1f30384baef4056438d81b305a6a5199b0d16c (diff)
parentac91d85456372a90af5b85eb6620fd2efb1e431b (diff)
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 18bde979f34..877fe4f8e05 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -571,11 +571,6 @@ static int set_user(struct cred *new)
if (!new_user)
return -EAGAIN;
- if (!task_can_switch_user(new_user, current)) {
- free_uid(new_user);
- return -EINVAL;
- }
-
if (atomic_read(&new_user->processes) >=
current->signal->rlim[RLIMIT_NPROC].rlim_cur &&
new_user != INIT_USER) {