* [PATCH] serial: imx: fix a possible NULL dereference
@ 2015-11-12 7:46 LABBE Corentin
2015-11-16 12:14 ` Uwe Kleine-König
0 siblings, 1 reply; 2+ messages in thread
From: LABBE Corentin @ 2015-11-12 7:46 UTC (permalink / raw)
To: gregkh, jslaby; +Cc: LABBE Corentin, linux-kernel, linux-serial
of_match_device could return NULL, and so cause a NULL pointer
dereference later.
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
---
drivers/tty/serial/imx.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 016e4be..22e91f7 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1857,8 +1857,7 @@ static int serial_imx_probe_dt(struct imx_port *sport,
struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
- const struct of_device_id *of_id =
- of_match_device(imx_uart_dt_ids, &pdev->dev);
+ const struct of_device_id *of_id;
int ret;
if (!np)
@@ -1878,6 +1877,9 @@ static int serial_imx_probe_dt(struct imx_port *sport,
if (of_get_property(np, "fsl,dte-mode", NULL))
sport->dte_mode = 1;
+ of_id = of_match_device(imx_uart_dt_ids, &pdev->dev);
+ if (!of_id)
+ return -ENODEV;
sport->devdata = of_id->data;
return 0;
--
2.4.10
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] serial: imx: fix a possible NULL dereference
2015-11-12 7:46 [PATCH] serial: imx: fix a possible NULL dereference LABBE Corentin
@ 2015-11-16 12:14 ` Uwe Kleine-König
0 siblings, 0 replies; 2+ messages in thread
From: Uwe Kleine-König @ 2015-11-16 12:14 UTC (permalink / raw)
To: LABBE Corentin; +Cc: gregkh, jslaby, linux-kernel, linux-serial
Hello,
On Thu, Nov 12, 2015 at 08:46:21AM +0100, LABBE Corentin wrote:
> of_match_device could return NULL, and so cause a NULL pointer
> dereference later.
>
> Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
> ---
> drivers/tty/serial/imx.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
> index 016e4be..22e91f7 100644
> --- a/drivers/tty/serial/imx.c
> +++ b/drivers/tty/serial/imx.c
> @@ -1857,8 +1857,7 @@ static int serial_imx_probe_dt(struct imx_port *sport,
> struct platform_device *pdev)
> {
> struct device_node *np = pdev->dev.of_node;
> - const struct of_device_id *of_id =
> - of_match_device(imx_uart_dt_ids, &pdev->dev);
> + const struct of_device_id *of_id;
> int ret;
>
> if (!np)
> @@ -1878,6 +1877,9 @@ static int serial_imx_probe_dt(struct imx_port *sport,
> if (of_get_property(np, "fsl,dte-mode", NULL))
> sport->dte_mode = 1;
>
> + of_id = of_match_device(imx_uart_dt_ids, &pdev->dev);
> + if (!of_id)
> + return -ENODEV;
> sport->devdata = of_id->data;
>
> return 0;
I'd do something like:
- if (!np)
+ sport->devdata = of_device_get_match_data(&pdev->dev);
+ if (!sport->devdata)
/* no device tree device */
return 1;
instead.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-16 12:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-12 7:46 [PATCH] serial: imx: fix a possible NULL dereference LABBE Corentin
2015-11-16 12:14 ` Uwe Kleine-König
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).