Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

TTY: serial_core, add ->install

We need to compute the uart state only on the first open. This is
usually what is done in the ->install hook. serial_core used to do this
in ->open on every open. So move it to ->install.

As a side effect, it ensures the state is set properly in the window
after tty_init_dev is called, but before uart_open. This fixes a bunch
of races between tty_open and flush_to_ldisc we were dealing with
recently.

One of such bugs was attempted to fix in commit fedb5760648a (serial:
fix race between flush_to_ldisc and tty_open), but it only took care of
a couple of functions (uart_start and uart_unthrottle). I was able to
reproduce the crash on a SLE system, but in uart_write_room which is
also called from flush_to_ldisc via process_echoes. I was *unable* to
reproduce the bug locally. It is due to having this patch in my queue
since 2012!

general protection fault: 0000 [#1] SMP KASAN PTI
CPU: 1 PID: 5 Comm: kworker/u4:0 Tainted: G L 4.12.14-396-default #1 SLE15-SP1 (unreleased)
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c89-prebuilt.qemu.org 04/01/2014
Workqueue: events_unbound flush_to_ldisc
task: ffff8800427d8040 task.stack: ffff8800427f0000
RIP: 0010:uart_write_room+0xc4/0x590
RSP: 0018:ffff8800427f7088 EFLAGS: 00010202
RAX: dffffc0000000000 RBX: 0000000000000000 RCX: 0000000000000000
RDX: 000000000000002f RSI: 00000000000000ee RDI: ffff88003888bd90
RBP: ffffffffb9545850 R08: 0000000000000001 R09: 0000000000000400
R10: ffff8800427d825c R11: 000000000000006e R12: 1ffff100084fee12
R13: ffffc900004c5000 R14: ffff88003888bb28 R15: 0000000000000178
FS: 0000000000000000(0000) GS:ffff880043300000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000561da0794148 CR3: 000000000ebf4000 CR4: 00000000000006e0
Call Trace:
tty_write_room+0x6d/0xc0
__process_echoes+0x55/0x870
n_tty_receive_buf_common+0x105e/0x26d0
tty_ldisc_receive_buf+0xb7/0x1c0
tty_port_default_receive_buf+0x107/0x180
flush_to_ldisc+0x35d/0x5c0
...

0 in rbx means tty->driver_data is NULL in uart_write_room. 0x178 is
tried to be dereferenced (0x178 >> 3 is 0x2f in rdx) at
uart_write_room+0xc4. 0x178 is exactly (struct uart_state *)NULL->refcount
used in uart_port_lock from uart_write_room.

So revert the upstream commit here as my local patch should fix the
whole family.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Li RongQing <lirongqing@baidu.com>
Cc: Wang Li <wangli39@baidu.com>
Cc: Zhang Yu <zhangyu31@baidu.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jiri Slaby and committed by
Greg Kroah-Hartman
4cdd17ba 6bc3703d

+13 -11
+13 -11
drivers/tty/serial/serial_core.c
··· 130 130 struct uart_port *port; 131 131 unsigned long flags; 132 132 133 - if (!state) 134 - return; 135 - 136 133 port = uart_port_lock(state, flags); 137 134 __uart_start(tty); 138 135 uart_port_unlock(port, flags); ··· 726 729 struct uart_state *state = tty->driver_data; 727 730 upstat_t mask = UPSTAT_SYNC_FIFO; 728 731 struct uart_port *port; 729 - 730 - if (!state) 731 - return; 732 732 733 733 port = uart_port_ref(state); 734 734 if (!port) ··· 1741 1747 uart_port_deref(uport); 1742 1748 } 1743 1749 1750 + static int uart_install(struct tty_driver *driver, struct tty_struct *tty) 1751 + { 1752 + struct uart_driver *drv = driver->driver_state; 1753 + struct uart_state *state = drv->state + tty->index; 1754 + 1755 + tty->driver_data = state; 1756 + 1757 + return tty_standard_install(driver, tty); 1758 + } 1759 + 1744 1760 /* 1745 1761 * Calls to uart_open are serialised by the tty_lock in 1746 1762 * drivers/tty/tty_io.c:tty_open() ··· 1763 1759 */ 1764 1760 static int uart_open(struct tty_struct *tty, struct file *filp) 1765 1761 { 1766 - struct uart_driver *drv = tty->driver->driver_state; 1767 - int retval, line = tty->index; 1768 - struct uart_state *state = drv->state + line; 1769 - 1770 - tty->driver_data = state; 1762 + struct uart_state *state = tty->driver_data; 1763 + int retval; 1771 1764 1772 1765 retval = tty_port_open(&state->port, tty, filp); 1773 1766 if (retval > 0) ··· 2449 2448 #endif 2450 2449 2451 2450 static const struct tty_operations uart_ops = { 2451 + .install = uart_install, 2452 2452 .open = uart_open, 2453 2453 .close = uart_close, 2454 2454 .write = uart_write,