---

yaml --- r: 167723 b: refs/heads/master c: 0d0df59 h: refs/heads/master i: 167721: 59b94bf 167719: a2c0bd1 v: v3
git-mirror · Oct 29, 2009 · 30bb1bf · 30bb1bf
1 parent 18419ea
commit 30bb1bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 370c28def65b3a5765192753a164403619b41d01
+refs/heads/master: 0d0df599f1f11f12d589318bacb59a50fb5c0310
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
@@ -359,10 +359,8 @@ void __set_special_pids(struct pid *pid)
 {
 	struct task_struct *curr = current->group_leader;
 
-	if (task_session(curr) != pid) {
+	if (task_session(curr) != pid)
 		change_pid(curr, PIDTYPE_SID, pid);
-		proc_sid_connector(curr);
-	}
 
 	if (task_pgrp(curr) != pid)
 		change_pid(curr, PIDTYPE_PGID, pid);

diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
@@ -1110,6 +1110,8 @@ SYSCALL_DEFINE0(setsid)
 	err = session;
 out:
 	write_unlock_irq(&tasklist_lock);
+	if (err > 0)
+		proc_sid_connector(group_leader);
 	return err;
 }