diff mbox series

[SRU,B/C,4/4] tty: Simplify tty->count math in tty_reopen()

Message ID 20190108202811.12136-5-gpiccoli@canonical.com
State New
Headers show
Series Line discipline buffer flush/tty_reopen() race fix | expand

Commit Message

Guilherme G. Piccoli Jan. 8, 2019, 8:28 p.m. UTC 
From: Dmitry Safonov <dima@arista.com>

BugLink: https://bugs.launchpad.net/bugs/1791758

As notted by Jiri, tty_ldisc_reinit() shouldn't rely on tty counter.
Simplify math by increasing the counter after reinit success.

Cc: Jiri Slaby <jslaby@suse.com>
Link: lkml.kernel.org/r/<20180829022353.23568-2-dima@arista.com>
Suggested-by: Jiri Slaby <jslaby@suse.com>
Reviewed-by: Jiri Slaby <jslaby@suse.cz>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry-picked from cf62a1a13749db0d32b5cdd800ea91a4087319de upstream)
Signed-off-by: Guilherme G. Piccoli <gpiccoli@canonical.com>
---
 drivers/tty/tty_io.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 83e57a328f2b..b273aeadbb51 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1271,16 +1271,13 @@  static int tty_reopen(struct tty_struct *tty)
 	if (retval)
 		return retval;
 
-	tty->count++;
-	if (tty->ldisc)
-		goto out_unlock;
-
-	retval = tty_ldisc_reinit(tty, tty->termios.c_line);
-	if (retval)
-		tty->count--;
-
-out_unlock:
+	if (!tty->ldisc)
+		retval = tty_ldisc_reinit(tty, tty->termios.c_line);
 	tty_ldisc_unlock(tty);
+
+	if (retval == 0)
+		tty->count++;
+
 	return retval;
 }