* [PATCH -next] serial: omap: fix potential NULL pointer dereference in serial_omap_runtime_suspend()
@ 2013-06-05 2:04 Wei Yongjun
2013-06-05 15:28 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-06-05 2:04 UTC (permalink / raw)
To: gregkh, jslaby, grant.likely, rob.herring, sourav.poddar
Cc: yongjun_wei, linux-serial, devicetree-discuss
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
The dereference to 'up' should be moved below the NULL test.
Introduced by commit ddd85e225c8885b5e4419b0499ab27100e7c366a
(serial: omap: prevent runtime PM for "no_console_suspend")
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/tty/serial/omap-serial.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 1aaeca8..156b5aa 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] serial: omap: fix potential NULL pointer dereference in serial_omap_runtime_suspend()
2013-06-05 2:04 [PATCH -next] serial: omap: fix potential NULL pointer dereference in serial_omap_runtime_suspend() Wei Yongjun
@ 2013-06-05 15:28 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2013-06-05 15:28 UTC (permalink / raw)
To: Wei Yongjun
Cc: gregkh, jslaby, grant.likely, rob.herring, sourav.poddar,
yongjun_wei, devicetree-discuss, linux-serial
* Wei Yongjun <weiyj.lk@gmail.com> [130604 19:10]:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> The dereference to 'up' should be moved below the NULL test.
> Introduced by commit ddd85e225c8885b5e4419b0499ab27100e7c366a
> (serial: omap: prevent runtime PM for "no_console_suspend")
Acked-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> drivers/tty/serial/omap-serial.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
> index 1aaeca8..156b5aa 100644
> --- a/drivers/tty/serial/omap-serial.c
> +++ b/drivers/tty/serial/omap-serial.c
> @@ -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;
>
>
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-05 15:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-05 2:04 [PATCH -next] serial: omap: fix potential NULL pointer dereference in serial_omap_runtime_suspend() Wei Yongjun
2013-06-05 15:28 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).