summaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2008-02-08 13:19:12 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 18:22:27 +0100
commit6806aac6d282d58b97763f5e17e2787e62c3b440 (patch)
tree4076069a60e054a2d8c31bc2998607668b0a40b0 /kernel/sys.c
parentfix group stop with exit race (diff)
downloadlinux-6806aac6d282d58b97763f5e17e2787e62c3b440.tar.xz
linux-6806aac6d282d58b97763f5e17e2787e62c3b440.zip
sys_setsid: remove now unneeded session != 1 check
Eric's "fix clone(CLONE_NEWPID)" eliminated the last reason for this hack. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 7de9c984f696..ee2e78dbea6c 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1056,11 +1056,8 @@ asmlinkage long sys_setsid(void)
/* Fail if a process group id already exists that equals the
* proposed session id.
- *
- * Don't check if session == 1, clone(CLONE_NEWPID) creates
- * this group/session beforehand.
*/
- if (session != 1 && pid_task(sid, PIDTYPE_PGID))
+ if (pid_task(sid, PIDTYPE_PGID))
goto out;
group_leader->signal->leader = 1;