2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index cc941a3504d7..a19fef2093f1 100644
--- a/drivers/char/tty_io.c
+++ b/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/kernel/exit.c b/kernel/exit.c
index 1143012951e9..6f50ef55a6f3 100644
--- a/kernel/exit.c
+++ b/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);