Commit 383cf647 authored Nov 01, 2018 by Dmitry Safonov Committed by Greg Kroah-Hartman Jan 23, 2019

tty: Simplify tty->count math in tty_reopen()



commit cf62a1a13749db0d32b5cdd800ea91a4087319de upstream.

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>

parent b4ff011f

drivers/tty/tty_io.c

+5 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1491,16 +1491,13 @@ static int tty_reopen(struct tty_struct *tty)
	if (retval)		if (retval)
	return retval;		return retval;

	tty->count++;		if (!tty->ldisc)
	if (tty->ldisc)
	goto out_unlock;

	retval = tty_ldisc_reinit(tty, tty->termios.c_line);		retval = tty_ldisc_reinit(tty, tty->termios.c_line);
	if (retval)
	tty->count--;

	out_unlock:
	tty_ldisc_unlock(tty);		tty_ldisc_unlock(tty);

			if (retval == 0)
			tty->count++;

	return retval;		return retval;
	}		}