* [PATCH] iio: adc - Fix possible NULL derefrence.
[not found] <CGME20170130044724epcas3p444b23d43fed213511e6994ecb4ed0ef3@epcas3p4.samsung.com>
@ 2017-01-30 4:47 ` Shailendra Verma
2017-01-30 12:13 ` Marek Vasut
0 siblings, 1 reply; 2+ messages in thread
From: Shailendra Verma @ 2017-01-30 4:47 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, Heiko Stuebner, Dmitry Torokhov,
Ksenija Stanojevic, Marek Vasut, linux-iio, linux-arm-kernel,
linux-rockchip, 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/iio/adc/mxs-lradc.c | 14 ++++++++++----
drivers/iio/adc/rockchip_saradc.c | 4 ++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c
index b84d37c..4308a59 100644
--- a/drivers/iio/adc/mxs-lradc.c
+++ b/drivers/iio/adc/mxs-lradc.c
@@ -1570,10 +1570,8 @@ 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 of_device_id *of_id;
+ const struct mxs_lradc_of_config *of_cfg;
struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node;
struct mxs_lradc *lradc;
@@ -1583,6 +1581,14 @@ static int mxs_lradc_probe(struct platform_device *pdev)
int i, s;
u64 scale_uv;
+ of_id = of_match_device(mxs_lradc_dt_ids, &pdev->dev);
+ if (!of_id) {
+ dev_err(&pdev->dev, "Error: No device match found\n");
+ return -ENODEV;
+ }
+
+ of_cfg = &mxs_lradc_of_config[(enum mxs_lradc_id)of_id->data];
+
/* Allocate the IIO device. */
iio = devm_iio_device_alloc(dev, sizeof(*lradc));
if (!iio) {
diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index 85d7012..08dfb43 100644
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -224,6 +224,10 @@ 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, "Error: No device match found\n");
+ return -ENODEV;
+ }
info->data = match->data;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iio: adc - Fix possible NULL derefrence.
2017-01-30 4:47 ` [PATCH] iio: adc - Fix possible NULL derefrence Shailendra Verma
@ 2017-01-30 12:13 ` Marek Vasut
0 siblings, 0 replies; 2+ messages in thread
From: Marek Vasut @ 2017-01-30 12:13 UTC (permalink / raw)
To: Shailendra Verma, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, Heiko Stuebner,
Dmitry Torokhov, Ksenija Stanojevic, linux-iio, linux-arm-kernel,
linux-rockchip, linux-kernel, p.shailesh, ashish.kalra,
Shailendra Verma
On 01/30/2017 05:47 AM, Shailendra Verma wrote:
> of_match_device could return NULL, and so can cause a NULL
> pointer dereference later.
>
> Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>
a) this should be two patches
b) same question as in case of the mmc patch -- The probe won't be
called if OF match doesn't happen in the first place, so this check is
redundant, no ?
> ---
> drivers/iio/adc/mxs-lradc.c | 14 ++++++++++----
> drivers/iio/adc/rockchip_saradc.c | 4 ++++
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c
> index b84d37c..4308a59 100644
> --- a/drivers/iio/adc/mxs-lradc.c
> +++ b/drivers/iio/adc/mxs-lradc.c
> @@ -1570,10 +1570,8 @@ 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 of_device_id *of_id;
> + const struct mxs_lradc_of_config *of_cfg;
> struct device *dev = &pdev->dev;
> struct device_node *node = dev->of_node;
> struct mxs_lradc *lradc;
> @@ -1583,6 +1581,14 @@ static int mxs_lradc_probe(struct platform_device *pdev)
> int i, s;
> u64 scale_uv;
>
> + of_id = of_match_device(mxs_lradc_dt_ids, &pdev->dev);
> + if (!of_id) {
> + dev_err(&pdev->dev, "Error: No device match found\n");
> + return -ENODEV;
> + }
> +
> + of_cfg = &mxs_lradc_of_config[(enum mxs_lradc_id)of_id->data];
> +
> /* Allocate the IIO device. */
> iio = devm_iio_device_alloc(dev, sizeof(*lradc));
> if (!iio) {
> diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
> index 85d7012..08dfb43 100644
> --- a/drivers/iio/adc/rockchip_saradc.c
> +++ b/drivers/iio/adc/rockchip_saradc.c
> @@ -224,6 +224,10 @@ 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, "Error: No device match found\n");
> + return -ENODEV;
> + }
> info->data = match->data;
>
> mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-30 12:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20170130044724epcas3p444b23d43fed213511e6994ecb4ed0ef3@epcas3p4.samsung.com>
2017-01-30 4:47 ` [PATCH] iio: adc - Fix possible NULL derefrence Shailendra Verma
2017-01-30 12:13 ` Marek Vasut
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).