summaryrefslogtreecommitdiff
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2018-01-11 17:57:26 (GMT)
committer jie.yuan <jie.yuan@amlogic.com>2018-04-03 05:58:52 (GMT)
commitd9d62dbcc23e1f5a8772c8cd671d5c8277674c3a (patch)
tree0ec2c0a72a4c13f569ccd4915d11a90436554b10
parentb42b8b8320047c27656caccc9f9ea2cc0bed88e5 (diff)
downloadcommon-d9d62dbcc23e1f5a8772c8cd671d5c8277674c3a.zip
common-d9d62dbcc23e1f5a8772c8cd671d5c8277674c3a.tar.gz
common-d9d62dbcc23e1f5a8772c8cd671d5c8277674c3a.tar.bz2
serial: core: mark port as initialized after successful IRQ change
PD#163025: fix pwq null pointer commit 44117a1d1732c513875d5a163f10d9adbe866c08 upstream. setserial changes the IRQ via uart_set_info(). It invokes uart_shutdown() which free the current used IRQ and clear TTY_PORT_INITIALIZED. It will then update the IRQ number and invoke uart_startup() before returning to the caller leaving TTY_PORT_INITIALIZED cleared. The next open will crash with | list_add double add: new=ffffffff839fcc98, prev=ffffffff839fcc98, next=ffffffff839fcc98. since the close from the IOCTL won't free the IRQ (and clean the list) due to the TTY_PORT_INITIALIZED check in uart_shutdown(). There is same pattern in uart_do_autoconfig() and I *think* it also needs to set TTY_PORT_INITIALIZED there. Is there a reason why uart_startup() does not set the flag by itself after the IRQ has been acquired (since it is cleared in uart_shutdown)? Change-Id: I8c86b0aeb36986195276d94abd68917a08758a3e Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--drivers/tty/serial/serial_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 70ad5fe..839cee4 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -968,6 +968,8 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
}
} else {
retval = uart_startup(tty, state, 1);
+ if (retval == 0)
+ tty_port_set_initialized(port, true);
if (retval > 0)
retval = 0;
}