From 3e142e565b8c9f782c949f01917d2ab8c9228d20 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 30 Nov 2009 13:18:45 +0000 Subject: [PATCH] --- yaml --- r: 175364 b: refs/heads/master c: 5ec93d1154fd1e269162398f8e70efc7e004485d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_io.c | 5 +++-- trunk/kernel/exit.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c56d0c044019..bc52896ae665 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38c70b27f9502c31c1d0c29676275f7362cdb0d9 +refs/heads/master: 5ec93d1154fd1e269162398f8e70efc7e004485d diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index cc941a3504d7..a19fef2093f1 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -707,6 +707,8 @@ void disassociate_ctty(int on_exit) struct tty_struct *tty; struct pid *tty_pgrp = NULL; + if (!current->signal->leader) + return; tty = get_current_tty(); if (tty) { @@ -772,8 +774,7 @@ void no_tty(void) { struct task_struct *tsk = current; lock_kernel(); - if (tsk->signal->leader) - disassociate_ctty(0); + disassociate_ctty(0); unlock_kernel(); proc_clear_tty(tsk); } diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 1143012951e9..6f50ef55a6f3 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -971,7 +971,7 @@ NORET_TYPE void do_exit(long code) exit_thread(); cgroup_exit(tsk, 1); - if (group_dead && tsk->signal->leader) + if (group_dead) disassociate_ctty(1); module_put(task_thread_info(tsk)->exec_domain->module);