Skip to contentSkip to conversation

fork: Allow init to become a session leader.

PATCH In review Eric W. Biederman 2 participants 3 messages Feb 8, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fork: Allow init to become a session leader.

With the bug fixes from killing session == 0 and pgrp == 0 we have essentially made pid == 1 a session leader. However reading through the code I can see nothing, that sets the session->leader flag. In fact we actively clear it in all cases during clone. And setsid will fail to set it because the session == 1 and process group == 1 already exist.

So this patch forces the session leader flag and for good measure the pgrp, session and tty of init as well.

---

 kernel/fork.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

6bc9fa2aca38bf739e20ae6192a068310ff9739a

kernel/fork.c +10 -3
index a08e5cf..ff10b11 100644
@@ -1179,9 +1179,16 @@ static task_t *copy_process(unsigned lon
 		attach_pid(p, PIDTYPE_PID, p->pid);
 		attach_pid(p, PIDTYPE_TGID, p->tgid);
 		if (thread_group_leader(p)) {
-			p->signal->tty = current->signal->tty;
-			p->signal->pgrp = process_group(current);
-			p->signal->session = current->signal->session;
+			if (unlikely(p->pid == 1)) {
+				p->signal->tty = NULL;
+				p->signal->leader = 1;
+				p->signal->pgrp = 1;
+				p->signal->session = 1;
+			} else {
+				p->signal->tty = current->signal->tty;
+				p->signal->pgrp = process_group(current);
+				p->signal->session = current->signal->session;
+			}
 			attach_pid(p, PIDTYPE_PGID, process_group(p));
 			attach_pid(p, PIDTYPE_SID, p->signal->session);
 			__get_cpu_var(process_counts)++;
Signature · 1 line
1.1.5.g3480
#1 lore raw
Quoted 15 lines · Eric W. Biederman

With the bug fixes from killing session == 0 and pgrp == 0 we have essentially made pid == 1 a session leader. However reading through the code I can see nothing, that sets the session->leader flag. In fact we actively clear it in all cases during clone. And setsid will fail to set it because the session == 1 and process group == 1 already exist.

So this patch forces the session leader flag and for good measure the pgrp, session and tty of init as well.

kernel/fork.c +0 -0
@@ -1179,9 +1179,16 @@ static task_t *copy_process(unsigned lon
                attach_pid(p, PIDTYPE_PID, p->pid);

kernel/fork.c static task_t *copy_process(unsigned lon · line 1186

Quoted 10 lines
kernel/fork.c +5 -3
                attach_pid(p, PIDTYPE_TGID, p->tgid);
                if (thread_group_leader(p)) {
-                       p->signal->tty = current->signal->tty;
-                       p->signal->pgrp = process_group(current);
-                       p->signal->session = current->signal->session;
+                       if (unlikely(p->pid == 1)) {
+                               p->signal->tty = NULL;
+                               p->signal->leader = 1;
+                               p->signal->pgrp = 1;
+                               p->signal->session = 1;

Isn't it enough to just set current->signal->leader = 1 in init/main.c:init() ? This process was already forked with (1,1) special pids and ->tty == NULL.

Oleg.

#2 lore raw
Quoted 22 lines · Oleg Nesterov
Quoted 21 lines · Eric W. Biederman

With the bug fixes from killing session == 0 and pgrp == 0 we have essentially made pid == 1 a session leader. However reading through the code I can see nothing, that sets the session->leader flag. In fact we actively clear it in all cases during clone. And setsid will fail to set it because the session == 1 and process group == 1 already exist.

So this patch forces the session leader flag and for good measure the pgrp, session and tty of init as well.

kernel/fork.c +1 -3
@@ -1179,9 +1179,16 @@ static task_t *copy_process(unsigned lon
                attach_pid(p, PIDTYPE_PID, p->pid);
                attach_pid(p, PIDTYPE_TGID, p->tgid);
                if (thread_group_leader(p)) {
-                       p->signal->tty = current->signal->tty;
-                       p->signal->pgrp = process_group(current);
-                       p->signal->session = current->signal->session;
+                       if (unlikely(p->pid == 1)) {
Quoted 8 lines

kernel/fork.c static task_t *copy_process(unsigned lon · line 1186

Quoted 4 lines
kernel/fork.c +4 -0
+                               p->signal->tty = NULL;
+                               p->signal->leader = 1;
+                               p->signal->pgrp = 1;
+                               p->signal->session = 1;

Isn't it enough to just set current->signal->leader = 1 in init/main.c:init() ? This process was already forked with (1,1) special pids and ->tty == NULL.

At the moment yes. Being explicit can help readability.

This allows us the opportunity to leave the unhashed idle task as (0,0) and more interesting to me, if we ever fork another process with pid == 1 in a different process id namespace we do need to do all of this.

Eric