linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Mfd - Fix possible NULL derefrence.
       [not found] <CGME20170127111654epcas1p34aa51a351ad04a35b68a1fc88438fc27@epcas1p3.samsung.com>
@ 2017-01-27 11:16 ` Shailendra Verma
  2017-02-07 11:51   ` Andy Shevchenko
  2017-02-07 16:32   ` Lee Jones
  0 siblings, 2 replies; 3+ messages in thread
From: Shailendra Verma @ 2017-01-27 11:16 UTC (permalink / raw)
  To: Lee Jones, linux-kernel, p.shailesh, ashish.kalra,
	Shailendra Verma, Shailendra Verma

of_match_device could return NULL, and so can cause a NULL
pointer dereference later.

Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>
---
 drivers/mfd/mc13xxx-i2c.c |    4 ++++
 drivers/mfd/mc13xxx-spi.c |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
index 67e4c9a..e03f454 100644
--- a/drivers/mfd/mc13xxx-i2c.c
+++ b/drivers/mfd/mc13xxx-i2c.c
@@ -80,6 +80,10 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
 	if (client->dev.of_node) {
 		const struct of_device_id *of_id =
 			of_match_device(mc13xxx_dt_ids, &client->dev);
+		if (!of_id) {
+			dev_err(&client->dev, "Error: No device match found\n");
+			return -ENODEV;
+		}
 		mc13xxx->variant = of_id->data;
 	} else {
 		mc13xxx->variant = (void *)id->driver_data;
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index cbc1e5e..97ab19c 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -157,7 +157,10 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
 	if (spi->dev.of_node) {
 		const struct of_device_id *of_id =
 			of_match_device(mc13xxx_dt_ids, &spi->dev);
+		if (!of_id) {
+			dev_err(&spi->dev, "Error: No device match found\n");
+			return -ENODEV;
+		}
 		mc13xxx->variant = of_id->data;
 	} else {
 		const struct spi_device_id *id_entry = spi_get_device_id(spi);
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] Mfd - Fix possible NULL derefrence.
  2017-01-27 11:16 ` [PATCH] Mfd - Fix possible NULL derefrence Shailendra Verma
@ 2017-02-07 11:51   ` Andy Shevchenko
  2017-02-07 16:32   ` Lee Jones
  1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2017-02-07 11:51 UTC (permalink / raw)
  To: Shailendra Verma
  Cc: Lee Jones, linux-kernel, p.shailesh, ashish.kalra, Shailendra Verma

On Fri, Jan 27, 2017 at 1:16 PM, Shailendra Verma
<shailendra.v@samsung.com> wrote:
> of_match_device could return NULL, and so can cause a NULL
> pointer dereference later.

I think it's not possible.

> --- a/drivers/mfd/mc13xxx-i2c.c
> +++ b/drivers/mfd/mc13xxx-i2c.c
> @@ -80,6 +80,10 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
>         if (client->dev.of_node) {
>                 const struct of_device_id *of_id =
>                         of_match_device(mc13xxx_dt_ids, &client->dev);
> +               if (!of_id) {
> +                       dev_err(&client->dev, "Error: No device match found\n");
> +                       return -ENODEV;
> +               }
>                 mc13xxx->variant = of_id->data;
>         } else {
>                 mc13xxx->variant = (void *)id->driver_data;
> diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
> index cbc1e5e..97ab19c 100644
> --- a/drivers/mfd/mc13xxx-spi.c
> +++ b/drivers/mfd/mc13xxx-spi.c
> @@ -157,7 +157,10 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
>         if (spi->dev.of_node) {
>                 const struct of_device_id *of_id =
>                         of_match_device(mc13xxx_dt_ids, &spi->dev);
> +               if (!of_id) {
> +                       dev_err(&spi->dev, "Error: No device match found\n");
> +                       return -ENODEV;
> +               }
>                 mc13xxx->variant = of_id->data;
>         } else {
>                 const struct spi_device_id *id_entry = spi_get_device_id(spi);
> --
> 1.7.9.5
>



-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Mfd - Fix possible NULL derefrence.
  2017-01-27 11:16 ` [PATCH] Mfd - Fix possible NULL derefrence Shailendra Verma
  2017-02-07 11:51   ` Andy Shevchenko
@ 2017-02-07 16:32   ` Lee Jones
  1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2017-02-07 16:32 UTC (permalink / raw)
  To: Shailendra Verma; +Cc: linux-kernel, p.shailesh, ashish.kalra, Shailendra Verma

On Fri, 27 Jan 2017, Shailendra Verma wrote:

> of_match_device could return NULL, and so can cause a NULL
> pointer dereference later.

I don't think it can.

Did this actually happen to you?

> Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>
> ---
>  drivers/mfd/mc13xxx-i2c.c |    4 ++++
>  drivers/mfd/mc13xxx-spi.c |    5 ++++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
> index 67e4c9a..e03f454 100644
> --- a/drivers/mfd/mc13xxx-i2c.c
> +++ b/drivers/mfd/mc13xxx-i2c.c
> @@ -80,6 +80,10 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
>  	if (client->dev.of_node) {
>  		const struct of_device_id *of_id =
>  			of_match_device(mc13xxx_dt_ids, &client->dev);
> +		if (!of_id) {
> +			dev_err(&client->dev, "Error: No device match found\n");
> +			return -ENODEV;
> +		}
>  		mc13xxx->variant = of_id->data;
>  	} else {
>  		mc13xxx->variant = (void *)id->driver_data;
> diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
> index cbc1e5e..97ab19c 100644
> --- a/drivers/mfd/mc13xxx-spi.c
> +++ b/drivers/mfd/mc13xxx-spi.c
> @@ -157,7 +157,10 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
>  	if (spi->dev.of_node) {
>  		const struct of_device_id *of_id =
>  			of_match_device(mc13xxx_dt_ids, &spi->dev);
> +		if (!of_id) {
> +			dev_err(&spi->dev, "Error: No device match found\n");
> +			return -ENODEV;
> +		}
>  		mc13xxx->variant = of_id->data;
>  	} else {
>  		const struct spi_device_id *id_entry = spi_get_device_id(spi);

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-02-07 16:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <CGME20170127111654epcas1p34aa51a351ad04a35b68a1fc88438fc27@epcas1p3.samsung.com>
2017-01-27 11:16 ` [PATCH] Mfd - Fix possible NULL derefrence Shailendra Verma
2017-02-07 11:51   ` Andy Shevchenko
2017-02-07 16:32   ` Lee Jones

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).