Commit 401fb66a authored by Indan Zupancic's avatar Indan Zupancic Committed by Greg Kroah-Hartman
Browse files

fsl_lpuart: Don't enable interrupts too early 



If an irq is pending when devm_request_irq() is called, the irq
handler will cause a NULL pointer access because initialisation
is not done yet.

Fixes: 9d7ee0e2 ("tty: serial: lpuart: avoid report NULL interrupt")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarIndan Zupancic <Indan.Zupancic@mep-info.com>
Link: https://lore.kernel.org/r/20220505114750.45423-1-Indan.Zupancic@mep-info.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9361ebfb

drivers/tty/serial/fsl_lpuart.c

+9 −9
Original line number Diff line number Diff line
@@ -2664,6 +2664,7 @@ static int lpuart_probe(struct platform_device *pdev) 
	struct device_node *np = pdev->dev.of_node;

	struct lpuart_port *sport;

	struct resource *res;

	irq_handler_t handler;

	int ret;



	sport = devm_kzalloc(&pdev->dev, sizeof(*sport), GFP_KERNEL);
@@ -2741,17 +2742,11 @@ static int lpuart_probe(struct platform_device *pdev) 


	if (lpuart_is_32(sport)) {

		lpuart_reg.cons = LPUART32_CONSOLE;

		ret = devm_request_irq(&pdev->dev, sport->port.irq, lpuart32_int, 0,

					DRIVER_NAME, sport);

		handler = lpuart32_int;

	} else {

		lpuart_reg.cons = LPUART_CONSOLE;

		ret = devm_request_irq(&pdev->dev, sport->port.irq, lpuart_int, 0,

					DRIVER_NAME, sport);

		handler = lpuart_int;

	}



	if (ret)

		goto failed_irq_request;



	ret = uart_add_one_port(&lpuart_reg, &sport->port);

	if (ret)

		goto failed_attach_port;
@@ -2773,13 +2768,18 @@ static int lpuart_probe(struct platform_device *pdev) 


	sport->port.rs485_config(&sport->port, &sport->port.rs485);



	ret = devm_request_irq(&pdev->dev, sport->port.irq, handler, 0,

				DRIVER_NAME, sport);

	if (ret)

		goto failed_irq_request;



	return 0;



failed_irq_request:

failed_get_rs485:

failed_reset:

	uart_remove_one_port(&lpuart_reg, &sport->port);

failed_attach_port:

failed_irq_request:

	lpuart_disable_clks(sport);

failed_clock_enable:

failed_out_of_range: