tty: Fix hangup race with TIOCSETD ioctl
The hangup may already have happened; check for that state also. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
9fbfa34c18
commit
e97733ca67
@ -546,10 +546,8 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
|
|||||||
old_ldisc = tty->ldisc;
|
old_ldisc = tty->ldisc;
|
||||||
tty_lock(tty);
|
tty_lock(tty);
|
||||||
|
|
||||||
/* FIXME: for testing only */
|
if (test_bit(TTY_HUPPING, &tty->flags) ||
|
||||||
WARN_ON(test_bit(TTY_HUPPED, &tty->flags));
|
test_bit(TTY_HUPPED, &tty->flags)) {
|
||||||
|
|
||||||
if (test_bit(TTY_HUPPING, &tty->flags)) {
|
|
||||||
/* We were raced by the hangup method. It will have stomped
|
/* We were raced by the hangup method. It will have stomped
|
||||||
the ldisc data and closed the ldisc down */
|
the ldisc data and closed the ldisc down */
|
||||||
tty_ldisc_enable_pair(tty, o_tty);
|
tty_ldisc_enable_pair(tty, o_tty);
|
||||||
|
Reference in New Issue
Block a user