Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f490894 authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

tty: atmel_serial: fix a potential NULL pointer dereference 



commit c85be041065c0be8bc48eda4c45e0319caf1d0e5 upstream.

In case dmaengine_prep_dma_cyclic fails, the fix returns a proper
error code to avoid NULL pointer dereference.

Signed-off-by: default avatarKangjie Lu <kjlu@umn.edu>
Fixes: 34df42f5 ("serial: at91: add rx dma support")
Acked-by: default avatarRichard Genoud <richard.genoud@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2689a646

drivers/tty/serial/atmel_serial.c

+4 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,10 @@ static int atmel_prepare_rx_dma(struct uart_port *port) 
					 sg_dma_len(&atmel_port->sg_rx)/2,

					 DMA_DEV_TO_MEM,

					 DMA_PREP_INTERRUPT);

	if (!desc) {

		dev_err(port->dev, "Preparing DMA cyclic failed\n");

		goto chan_err;

	}

	desc->callback = atmel_complete_rx_dma;

	desc->callback_param = port;

	atmel_port->desc_rx = desc;