Skip to content

Commit

Permalink
tty/serial: at91: fix race condition in atmel_serial_remove
Browse files Browse the repository at this point in the history
The _remove callback could be called when a tasklet is scheduled. tasklet_kill
was called inside the function in order to free up any scheduled tasklets.
However it was called after uart_remove_one_port which destroys tty references
needed in the port for atmel_tasklet_func.
Simply putting the tasklet_kill at the start of the function will prevent this
conflict.

Signed-off-by: Marek Roszko <mark.roszko@gmail.com>
Acked-by: Leilei Zhao <leilei.zhao@atmel.com>
Cc: <stable@vger.kernel.org> # v3.12
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Marek Roszko authored and Greg Kroah-Hartman committed Jan 8, 2014
1 parent 0cc7c6c commit f50c995
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/tty/serial/atmel_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -2447,11 +2447,12 @@ static int atmel_serial_remove(struct platform_device *pdev)
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
int ret = 0;

tasklet_kill(&atmel_port->tasklet);

device_init_wakeup(&pdev->dev, 0);

ret = uart_remove_one_port(&atmel_uart, port);

tasklet_kill(&atmel_port->tasklet);
kfree(atmel_port->rx_ring.buf);

/* "port" is allocated statically, so we shouldn't free it */
Expand Down

0 comments on commit f50c995

Please sign in to comment.