From: Peter Hurley Date: Sat, 15 Jun 2013 11:04:50 +0000 (-0400) Subject: tty: Fix hangup race with TIOCSETD ioctl X-Git-Tag: v3.12-rc1~182^2~223 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e97733ca677878d0ecf08af17f4661eb83e268bc;p=platform%2Fkernel%2Flinux-exynos.git tty: Fix hangup race with TIOCSETD ioctl The hangup may already have happened; check for that state also. Signed-off-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c index 31bd45a..5819667 100644 --- a/drivers/tty/tty_ldisc.c +++ b/drivers/tty/tty_ldisc.c @@ -546,10 +546,8 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc) old_ldisc = tty->ldisc; tty_lock(tty); - /* FIXME: for testing only */ - WARN_ON(test_bit(TTY_HUPPED, &tty->flags)); - - if (test_bit(TTY_HUPPING, &tty->flags)) { + if (test_bit(TTY_HUPPING, &tty->flags) || + test_bit(TTY_HUPPED, &tty->flags)) { /* We were raced by the hangup method. It will have stomped the ldisc data and closed the ldisc down */ tty_ldisc_enable_pair(tty, o_tty);