2015-11-12 07:50:04

by Corentin Labbe

Subject: [PATCH] mfd: qcom_rpm: fix a possible NULL dereference

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

Signed-off-by: LABBE Corentin <[email protected]>
---
drivers/mfd/qcom_rpm.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c
index 207a3bd..1be47ad 100644
--- a/drivers/mfd/qcom_rpm.c
+++ b/drivers/mfd/qcom_rpm.c
@@ -495,6 +495,8 @@ static int qcom_rpm_probe(struct platform_device *pdev)
}

match = of_match_device(qcom_rpm_of_match, &pdev->dev);
+ if (!match)
+ return -ENODEV;
rpm->data = match->data;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
2.4.10

2015-11-24 16:46:49

by Lee Jones

Subject: Re: [PATCH] mfd: qcom_rpm: fix a possible NULL dereference

On Thu, 12 Nov 2015, LABBE Corentin wrote:

> of_match_device could return NULL, and so cause a NULL pointer
> dereference later.
>
> Signed-off-by: LABBE Corentin <[email protected]>
> ---
> drivers/mfd/qcom_rpm.c | 2 ++
> 1 file changed, 2 insertions(+)

Applied, thanks.

> diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c
> index 207a3bd..1be47ad 100644
> --- a/drivers/mfd/qcom_rpm.c
> +++ b/drivers/mfd/qcom_rpm.c
> @@ -495,6 +495,8 @@ static int qcom_rpm_probe(struct platform_device *pdev)
> }
>
> match = of_match_device(qcom_rpm_of_match, &pdev->dev);
> + if (!match)
> + return -ENODEV;
> rpm->data = match->data;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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