Commit 40c9f61e authored by Shachar Shemesh's avatar Shachar Shemesh Committed by Greg Kroah-Hartman

tty ldisc: Close/Reopen race prevention should check the proper flag

Commit acfa747b 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: default avatarShachar Shemesh <shachar@liveu.tv>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb26dfe8
...@@ -659,7 +659,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc) ...@@ -659,7 +659,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
goto enable; 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 /* 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 */
clear_bit(TTY_LDISC_CHANGING, &tty->flags); clear_bit(TTY_LDISC_CHANGING, &tty->flags);
......
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