Skip to content

Commit

Permalink
start the global /sbin/init with 0,0 special pids
Browse files Browse the repository at this point in the history
As Eric pointed out, there is no problem with init starting with sid == pgid
== 0, and this was historical linux behavior changed in 2.6.18.

Remove kernel_init()->__set_special_pids(), this is unneeded and complicates
the rules for sys_setsid().

This change and the previous change in daemonize() mean that /sbin/init does
not need the special "session != 1" hack in sys_setsid() any longer. We can't
remove this check yet, we should cleanup copy_process(CLONE_NEWPID) first, so
update the comment only.

Signed-off-by: Oleg Nesterov <[email protected]>
Acked-by: "Eric W. Biederman" <[email protected]>
Cc: Pavel Emelyanov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Feb 8, 2008
1 parent 297bd42 commit 430c623
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,6 @@ static int __init kernel_init(void * unused)
*/
init_pid_ns.child_reaper = current;

__set_special_pids(task_pid(current));
cad_pid = task_pid(current);

smp_prepare_cpus(setup_max_cpus);
Expand Down
9 changes: 4 additions & 5 deletions kernel/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -1054,12 +1054,11 @@ asmlinkage long sys_setsid(void)
if (group_leader->signal->leader)
goto out;

/* Fail if a process group id already exists that equals the proposed
* session id.
/* Fail if a process group id already exists that equals the
* proposed session id.
*
* Don't check if session == 1 because kernel threads and CLONE_NEWPID
* tasks use this session id and so the check will always fail and make
* it so init cannot successfully call setsid.
* Don't check if session == 1, clone(CLONE_NEWPID) creates
* this group/session beforehand.
*/
if (session != 1 && pid_task(sid, PIDTYPE_PGID))
goto out;
Expand Down

0 comments on commit 430c623

Please sign in to comment.