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

Commit 7f25301d authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman
Browse files

serial: omap: fix potential NULL pointer dereference in serial_omap_runtime_suspend() 



The dereference to 'up' should be moved below the NULL test.
Introduced by commit ddd85e22
(serial: omap: prevent runtime PM for "no_console_suspend")

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c36d6006

drivers/tty/serial/omap-serial.c

+3 −3
Original line number Diff line number Diff line
@@ -1613,6 +1613,9 @@ static int serial_omap_runtime_suspend(struct device *dev) 
	struct uart_omap_port *up = dev_get_drvdata(dev);

	struct omap_uart_port_info *pdata = dev->platform_data;



	if (!up)

		return -EINVAL;



	/*

	* When using 'no_console_suspend', the console UART must not be

	* suspended. Since driver suspend is managed by runtime suspend,
@@ -1623,9 +1626,6 @@ static int serial_omap_runtime_suspend(struct device *dev) 
	    uart_console(&up->port))

		return -EBUSY;



	if (!up)

		return -EINVAL;



	if (!pdata)

		return 0;