tty/serial: at91: Handle shutdown more safely

marekr · gregkh · commit 0cc7c6c7916b · 2014-01-07T17:10:24.000-08:00
Interrupts were being cleaned up late in the shutdown handler, it is possible
that an interrupt can occur and schedule a tasklet that runs after the port is
cleaned up. There is a null dereference due to this race condition with the
following stacktrace:

[&lt;c02092b0&gt;] (atmel_tasklet_func+0x514/0x814) from [&lt;c001fd34&gt;] (tasklet_action+0x70/0xa8)
[&lt;c001fd34&gt;] (tasklet_action+0x70/0xa8) from [&lt;c001f60c&gt;] (__do_softirq+0x90/0x144)
[&lt;c001f60c&gt;] (__do_softirq+0x90/0x144) from [&lt;c001fa18&gt;] (irq_exit+0x40/0x4c)
[&lt;c001fa18&gt;] (irq_exit+0x40/0x4c) from [&lt;c000e298&gt;] (handle_IRQ+0x64/0x84)
[&lt;c000e298&gt;] (handle_IRQ+0x64/0x84) from [&lt;c000d6c0&gt;] (__irq_svc+0x40/0x50)
[&lt;c000d6c0&gt;] (__irq_svc+0x40/0x50) from [&lt;c0208060&gt;] (atmel_rx_dma_release+0x88/0xb8)
[&lt;c0208060&gt;] (atmel_rx_dma_release+0x88/0xb8) from [&lt;c0209740&gt;] (atmel_shutdown+0x104/0x160)
[&lt;c0209740&gt;] (atmel_shutdown+0x104/0x160) from [&lt;c0205e8c&gt;] (uart_port_shutdown+0x2c/0x38)

Signed-off-by: Marek Roszko &lt;mark.roszko@gmail.com&gt;
Acked-by: Leilei Zhao &lt;leilei.zhao@atmel.com&gt;
Cc: &lt;stable@vger.kernel.org&gt; # v3.12
Signed-off-by: Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
@@ -1650,12 +1650,24 @@ static int atmel_startup(struct uart_port *port)
 static void atmel_shutdown(struct uart_port *port)
 {
 	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+
 	/*
-	 * Ensure everything is stopped.
+	 * Clear out any scheduled tasklets before
+	 * we destroy the buffers
+	 */
+	tasklet_kill(&atmel_port->tasklet);
+
+	/*
+	 * Ensure everything is stopped and
+	 * disable all interrupts, port and break condition.
 	 */
 	atmel_stop_rx(port);
 	atmel_stop_tx(port);
 
+	UART_PUT_CR(port, ATMEL_US_RSTSTA);
+	UART_PUT_IDR(port, -1);
+
+
 	/*
 	 * Shut-down the DMA.
 	 */
@@ -1664,12 +1676,6 @@ static void atmel_shutdown(struct uart_port *port)
 	if (atmel_port->release_tx)
 		atmel_port->release_tx(port);
 
-	/*
-	 * Disable all interrupts, port and break condition.
-	 */
-	UART_PUT_CR(port, ATMEL_US_RSTSTA);
-	UART_PUT_IDR(port, -1);
-
 	/*
 	 * Free the interrupt
 	 */
