diff options
| author | Richard Genoud <richard.genoud@gmail.com> | 2017-03-20 11:52:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-22 07:15:01 +0200 |
| commit | de3596d3a3ea0cbb9ddd85a7491e766582b1dacc (patch) | |
| tree | ac5854d6568018b51a1c9241346f3852fd28f035 /drivers | |
| parent | dfcf2be2ae5aa49f454c53c932783aeb18723573 (diff) | |
tty/serial: atmel: fix race condition (TX+DMA)
commit 31ca2c63fdc0aee725cbd4f207c1256f5deaabde upstream.
If uart_flush_buffer() is called between atmel_tx_dma() and
atmel_complete_tx_dma(), the circular buffer has been cleared, but not
atmel_port->tx_len.
That leads to a circular buffer overflow (dumping (UART_XMIT_SIZE -
atmel_port->tx_len) bytes).
Tested-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/atmel_serial.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index daaed7c79e4f..f958ccda379a 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1867,6 +1867,11 @@ static void atmel_flush_buffer(struct uart_port *port) UART_PUT_TCR(port, 0); atmel_port->pdc_tx.ofs = 0; } + /* + * in uart_flush_buffer(), the xmit circular buffer has just + * been cleared, so we have to reset tx_len accordingly. + */ + sg_dma_len(&atmel_port->sg_tx) = 0; } /* |