USB: serial: console: fix reported terminal settings (f51ccf46) · Commits · 戴 / test

The USB-serial console implementation has never reported the actual terminal settings used. Despite storing the corresponding cflags in its struct console, these were never honoured on later tty open() where the tty termios would be left initialised to the driver defaults. Unlike the serial console implementation, the USB-serial code calls subdriver open() already at console setup. While calling set_termios() and write() before open() looks like it could work for some USB-serial drivers, others definitely do not expect this, so modelling this after serial core is going to be intrusive, if at all possible. Instead, use a (renamed) tty helper to save the termios data used at console setup so that the tty termios reflects the actual terminal settings after a subsequent tty open(). Note that the calls to tty_init_termios() (tty_driver_install()) and tty_save_termios() are serialised using the disconnect mutex. This specifically fixes a regression that was triggered by a recent change adding software flow control to the pl2303 driver: a getty trying to disable flow control while leaving the baud rate unchanged would now also set the baud rate to the driver default (prior to the flow-control change this had been a noop). Fixes: ("USB: serial: pl2303: add support for tx xon/xoff flow control") Cc: stable <stable@vger.kernel.org> # 4.18 Cc: Florian Zumbiehl <florz@florz.de> Reported-by:

Jarkko Nikula <jarkko.nikula@linux.intel.com> Tested-by:

Jarkko Nikula <jarkko.nikula@linux.intel.com> Acked-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by:

Johan Hovold <johan@kernel.org>

drivers/tty/tty_io.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -1373,7 +1373,13 @@ err_release_lock:
		return ERR_PTR(retval);
		}

		static void tty_free_termios(struct tty_struct *tty)
		/**
		* tty_save_termios() - save tty termios data in driver table
		* @tty: tty whose termios data to save
		*
		* Locking: Caller guarantees serialisation with tty_init_termios().
		*/
		void tty_save_termios(struct tty_struct *tty)
		{
		struct ktermios *tp;
		int idx = tty->index;
		@@ -1392,6 +1398,7 @@ static void tty_free_termios(struct tty_struct *tty)
		}
		*tp = tty->termios;
		}
		EXPORT_SYMBOL_GPL(tty_save_termios);

		/**
		* tty_flush_works - flush all works of a tty/pty pair
		@@ -1491,7 +1498,7 @@ static void release_tty(struct tty_struct *tty, int idx)
		WARN_ON(!mutex_is_locked(&tty_mutex));
		if (tty->ops->shutdown)
		tty->ops->shutdown(tty);
		tty_free_termios(tty);
		tty_save_termios(tty);
		tty_driver_remove_tty(tty->driver, tty);
		tty->port->itty = NULL;
		if (tty->link)

drivers/usb/serial/console.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ static int usb_console_setup(struct console co, char options)
		cflag \|= PARENB;
		break;
		}
		co->cflag = cflag;

		/*
		* no need to check the index here: if the index is wrong, console
		@@ -164,6 +163,7 @@ static int usb_console_setup(struct console co, char options)
		serial->type->set_termios(tty, port, &dummy);

		tty_port_tty_set(&port->port, NULL);
		tty_save_termios(tty);
		tty_kref_put(tty);
		}
		tty_port_set_initialized(&port->port, 1);

include/linux/tty.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -556,6 +556,7 @@ extern struct tty_struct tty_init_dev(struct tty_driver driver, int idx);
		extern void tty_release_struct(struct tty_struct *tty, int idx);
		extern int tty_release(struct inode inode, struct file filp);
		extern void tty_init_termios(struct tty_struct *tty);
		extern void tty_save_termios(struct tty_struct *tty);
		extern int tty_standard_install(struct tty_driver *driver,
		struct tty_struct *tty);

Admin message