Commit 5ec93d11 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

tty: Move the leader test in disassociate

There are two call points, both want to check that tty->signal->leader is
set. Move the test into disassociate_ctty() as that will make locking
changes easier in a bit
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 38c70b27
...@@ -707,6 +707,8 @@ void disassociate_ctty(int on_exit) ...@@ -707,6 +707,8 @@ void disassociate_ctty(int on_exit)
struct tty_struct *tty; struct tty_struct *tty;
struct pid *tty_pgrp = NULL; struct pid *tty_pgrp = NULL;
if (!current->signal->leader)
return;
tty = get_current_tty(); tty = get_current_tty();
if (tty) { if (tty) {
...@@ -772,8 +774,7 @@ void no_tty(void) ...@@ -772,8 +774,7 @@ void no_tty(void)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
lock_kernel(); lock_kernel();
if (tsk->signal->leader) disassociate_ctty(0);
disassociate_ctty(0);
unlock_kernel(); unlock_kernel();
proc_clear_tty(tsk); proc_clear_tty(tsk);
} }
......
...@@ -971,7 +971,7 @@ NORET_TYPE void do_exit(long code) ...@@ -971,7 +971,7 @@ NORET_TYPE void do_exit(long code)
exit_thread(); exit_thread();
cgroup_exit(tsk, 1); cgroup_exit(tsk, 1);
if (group_dead && tsk->signal->leader) if (group_dead)
disassociate_ctty(1); disassociate_ctty(1);
module_put(task_thread_info(tsk)->exec_domain->module); module_put(task_thread_info(tsk)->exec_domain->module);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment