tty: serial_core: add tty NULL check to uart_tx_stopped

Commit 761ed4a945 ("tty: serial_core: convert uart_close to use
tty_port_close") created a case where a port used for a console does not
get shutdown on tty closing. Then a call to uart_tx_stopped() segfaults
because the tty is NULL. This could be fixed to restore old behavior,
but we also want to allow tty_ports to work without a tty attached. So
this change to allow a NULL tty_struct is needed either way.

Fixes: 761ed4a945 ("tty: serial_core: convert uart_close to use tty_port_close")
Reported-by: kernel test robot <xiaolong.ye@intel.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rob Herring 2016-09-09 17:37:02 -05:00 committed by Greg Kroah-Hartman
parent e5e8960236
commit a727b025f4
1 changed files with 1 additions and 1 deletions

View File

@ -412,7 +412,7 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port);
static inline int uart_tx_stopped(struct uart_port *port) static inline int uart_tx_stopped(struct uart_port *port)
{ {
struct tty_struct *tty = port->state->port.tty; struct tty_struct *tty = port->state->port.tty;
if (tty->stopped || port->hw_stopped) if ((tty && tty->stopped) || port->hw_stopped)
return 1; return 1;
return 0; return 0;
} }