diff --git a/[refs] b/[refs] index 1c9e0b5fd246..6cbf95139d91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d12619b5ff5664623524aef796514d1946ea3b4a +refs/heads/master: 6806aac6d282d58b97763f5e17e2787e62c3b440 diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c index 7de9c984f696..ee2e78dbea6c 100644 --- a/trunk/kernel/sys.c +++ b/trunk/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;