2017-07-07 06:51:36

by Gustavo A. R. Silva

Subject: [PATCH] iio: adc: rockchip_saradc: add NULL check on of_match_device() return value

Check return value from call to of_match_device()
in order to prevent a NULL pointer dereference.

In case of NULL print error message and return -ENODEV

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/iio/adc/rockchip_saradc.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index ae6d332..2bf2ed1 100644
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -224,6 +224,11 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
info = iio_priv(indio_dev);

match = of_match_device(rockchip_saradc_match, &pdev->dev);
+ if (!match) {
+ dev_err(&pdev->dev, "failed to match device\n");
+ return -ENODEV;
+ }
+
info->data = match->data;

mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
2.5.0

2017-07-09 18:10:13

by Jonathan Cameron

Subject: Re: [PATCH] iio: adc: rockchip_saradc: add NULL check on of_match_device() return value

On Fri, 7 Jul 2017 01:51:31 -0500
"Gustavo A. R. Silva" <[email protected]> wrote:

> Check return value from call to of_match_device()
> in order to prevent a NULL pointer dereference.
>
> In case of NULL print error message and return -ENODEV
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
Applied.

Thanks,

Jonathan
> ---
> drivers/iio/adc/rockchip_saradc.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
> index ae6d332..2bf2ed1 100644
> --- a/drivers/iio/adc/rockchip_saradc.c
> +++ b/drivers/iio/adc/rockchip_saradc.c
> @@ -224,6 +224,11 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
> info = iio_priv(indio_dev);
>
> match = of_match_device(rockchip_saradc_match, &pdev->dev);
> + if (!match) {
> + dev_err(&pdev->dev, "failed to match device\n");
> + return -ENODEV;
> + }
> +
> info->data = match->data;
>
> mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

2017-07-17 04:57:53

by Gustavo A. R. Silva

Subject: Re: [PATCH] iio: adc: rockchip_saradc: add NULL check on of_match_device() return value

On 07/09/2017 01:10 PM, Jonathan Cameron wrote:
> On Fri, 7 Jul 2017 01:51:31 -0500
> "Gustavo A. R. Silva" <[email protected]> wrote:
>
>> Check return value from call to of_match_device()
>> in order to prevent a NULL pointer dereference.
>>
>> In case of NULL print error message and return -ENODEV
>>
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> Applied.
>

Thank you, Jonathan.

--
Gustavo A. R. Silva