Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Wei Yongjun 2013-06-05 10:04:49 +08:00 committed by Greg Kroah-Hartman
parent c36d6006d8
commit 7f25301d83
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/tty/serial/omap-serial.c
View File

@ -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;