diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2007-02-12 00:52:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 09:48:31 -0800 |
| commit | 2ea81868d8fba0bb56d7b45a08cc5f15dd2c6bb2 (patch) | |
| tree | 69b6df2015e315a5dcd0b8388c0cf4c6416734a5 /drivers/char/tty_io.c | |
| parent | 680a96710041c3c25464b5e093b80ca43cb94f52 (diff) | |
| download | linux-3.10-2ea81868d8fba0bb56d7b45a08cc5f15dd2c6bb2.tar.gz linux-3.10-2ea81868d8fba0bb56d7b45a08cc5f15dd2c6bb2.tar.bz2 linux-3.10-2ea81868d8fba0bb56d7b45a08cc5f15dd2c6bb2.zip | |
[PATCH] tty: fix the locking for signal->session in disassociate_ctty
commit 24ec839c431eb79bb8f6abc00c4e1eb3b8c4d517 while fixing the locking for
signal->tty got the locking wrong for signal->session. This places our
accesses of signal->session back under the tasklist_lock where they belong.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/tty_io.c')
| -rw-r--r-- | drivers/char/tty_io.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index ac937f767f2..abfe24d28c5 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -1496,7 +1496,6 @@ void disassociate_ctty(int on_exit) { struct tty_struct *tty; int tty_pgrp = -1; - int session; lock_kernel(); @@ -1530,7 +1529,6 @@ void disassociate_ctty(int on_exit) spin_lock_irq(¤t->sighand->siglock); current->signal->tty_old_pgrp = 0; - session = process_session(current); spin_unlock_irq(¤t->sighand->siglock); mutex_lock(&tty_mutex); @@ -1549,7 +1547,7 @@ void disassociate_ctty(int on_exit) /* Now clear signal->tty under the lock */ read_lock(&tasklist_lock); - session_clear_tty(session); + session_clear_tty(process_session(current)); read_unlock(&tasklist_lock); unlock_kernel(); } |