[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1471349438-16262-1-git-send-email-clabbe.montjoie@gmail.com>
Date: Tue, 16 Aug 2016 14:10:38 +0200
From: LABBE Corentin <clabbe.montjoie@...il.com>
To: knaack.h@....de, lars@...afoo.de, pmeerw@...erw.net
Cc: linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org,
LABBE Corentin <clabbe.montjoie@...il.com>
Subject: [PATCH] iio: mxs-lradc: fix a possible NULL dereference
of_match_device could return NULL, and so cause a NULL pointer
dereference later.
For fixing this problem, we use of_device_get_match_data(), this will
simplify the code a little by using a standard function for
getting the match data.
Reported-by: coverity (CID 1127209)
Signed-off-by: LABBE Corentin <clabbe.montjoie@...il.com>
---
drivers/iio/adc/mxs-lradc.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c
index b84d37c..378547c 100644
--- a/drivers/iio/adc/mxs-lradc.c
+++ b/drivers/iio/adc/mxs-lradc.c
@@ -1570,10 +1570,7 @@ static int mxs_lradc_probe_touchscreen(struct mxs_lradc *lradc,
static int mxs_lradc_probe(struct platform_device *pdev)
{
- const struct of_device_id *of_id =
- of_match_device(mxs_lradc_dt_ids, &pdev->dev);
- const struct mxs_lradc_of_config *of_cfg =
- &mxs_lradc_of_config[(enum mxs_lradc_id)of_id->data];
+ const struct mxs_lradc_of_config *of_cfg;
struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node;
struct mxs_lradc *lradc;
@@ -1591,7 +1588,8 @@ static int mxs_lradc_probe(struct platform_device *pdev)
}
lradc = iio_priv(iio);
- lradc->soc = (enum mxs_lradc_id)of_id->data;
+ lradc->soc = (enum mxs_lradc_id)of_device_get_match_data(&pdev->dev);
+ of_cfg = &mxs_lradc_of_config[lradc->soc];
/* Grab the memory area */
iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
2.7.3
Powered by blists - more mailing lists