From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Fri, 8 Feb 2008 12:19:12 +0000 (-0800)
Subject: sys_setsid: remove now unneeded session != 1 check
X-Git-Tag: v2.6.25-rc1~215
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6806aac6d282d58b97763f5e17e2787e62c3b440;p=linux-2.6

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>
---

diff --git a/kernel/sys.c b/kernel/sys.c
index 7de9c984f6..ee2e78dbea 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;