Commit c235ccc1 authored Sep 02, 2014 by Peter Hurley Committed by Greg Kroah-Hartman Sep 08, 2014

serial: core: Fix x_char race



The UART driver is expected to clear port->x_char after
transmission while holding the port->lock. However, the serial
core fails to take the port->lock before assigning port->xchar.
This allows for the following race

CPU 0                         |  CPU 1
                              |
                              | serial8250_handle_irq
                              |   ...
                              |   serial8250_tx_chars
                              |     if (port->x_char)
                              |       serial_out(up, UART_TX, port->x_char)
uart_send_xchar               |
  port->x_char = ch           |
                              |       port->x_char = 0
  port->ops->start_tx()       |
                              |

The x_char on CPU 0 will never be sent.

Take the port->lock in uart_send_xchar() before assigning port->x_char.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 5e42e9a3

drivers/tty/serial/serial_core.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -600,14 +600,13 @@ static void uart_send_xchar(struct tty_struct *tty, char ch)
		if (port->ops->send_xchar)
		port->ops->send_xchar(port, ch);
		else {
		port->x_char = ch;
		if (ch) {
		spin_lock_irqsave(&port->lock, flags);
		port->x_char = ch;
		if (ch)
		port->ops->start_tx(port);
		spin_unlock_irqrestore(&port->lock, flags);
		}
		}
		}

		static void uart_throttle(struct tty_struct *tty)
		{