Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=430c623121ea88ca80595c99fdc63b7f8a803ae5
Commit:     430c623121ea88ca80595c99fdc63b7f8a803ae5
Parent:     297bd42b15daed02453ff59ce6d31216a58b0398
Author:     Oleg Nesterov <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 8 04:19:11 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 09:22:27 2008 -0800

    start the global /sbin/init with 0,0 special pids
    
    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]>
---
 init/main.c  |    1 -
 kernel/sys.c |    9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/init/main.c b/init/main.c
index 9a5b18c..ed9747f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -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);
diff --git a/kernel/sys.c b/kernel/sys.c
index c326d6d..7de9c98 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to