Skip to content

Commit

Permalink
tty ldisc: Close/Reopen race prevention should check the proper flag
Browse files Browse the repository at this point in the history
Commit acfa747 introduced the TTY_HUPPING flag to distinguish
closed TTY from currently closing ones. The test in tty_set_ldisc
still remained pointing at the old flag. This causes pppd to
sometimes lapse into uninterruptible sleep when killed and
restarted.

Signed-off-by: Shachar Shemesh <shachar@liveu.tv>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Shachar Shemesh authored and gregkh committed Jul 26, 2012
1 parent 2588aba commit aa3c8af
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/tty/tty_ldisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
goto enable;
}

if (test_bit(TTY_HUPPED, &tty->flags)) {
if (test_bit(TTY_HUPPING, &tty->flags)) {
/* We were raced by the hangup method. It will have stomped
the ldisc data and closed the ldisc down */
clear_bit(TTY_LDISC_CHANGING, &tty->flags);
Expand Down

0 comments on commit aa3c8af

Please sign in to comment.