OSDN Git Service

iio: adc: meson-saradc: add NULL check on of_match_device() return value
authorGustavo A. R. Silva <garsilva@embeddedor.com>
Fri, 7 Jul 2017 06:46:30 +0000 (01:46 -0500)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 9 Jul 2017 18:04:23 +0000 (19:04 +0100)
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 <garsilva@embeddedor.com>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/meson_saradc.c

index 83da50e..c4e904b 100644 (file)
@@ -915,6 +915,11 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
        init_completion(&priv->done);
 
        match = of_match_device(meson_sar_adc_of_match, &pdev->dev);
+       if (!match) {
+               dev_err(&pdev->dev, "failed to match device\n");
+               return -ENODEV;
+       }
+
        priv->data = match->data;
 
        indio_dev->name = priv->data->name;