* [PATCH] mmc: dw_mmc: Fix to avoid potential NULL pointer dereference
@ 2019-03-19 0:19 Aditya Pakki
2019-03-19 0:43 ` [PATCH] mmc: dw_mmc: Fix to avoid potential NULL pointer dereference【请注意，邮件由linux-mmc-owner@vger.kernel.org代发】 Shawn Lin
0 siblings, 1 reply; 2+ messages in thread
From: Aditya Pakki @ 2019-03-19 0:19 UTC (permalink / raw)
To: pakki001
Cc: kjlu, Jaehoon Chung, Ulf Hansson, Kukjin Kim,
Krzysztof Kozlowski, linux-mmc, linux-arm-kernel,
linux-samsung-soc, linux-kernel
of_match_node can fail and return NULL in case no matching structure.
The patches checks for such a scenario and returns -ENXIO.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
drivers/mmc/host/dw_mmc-exynos.c | 2 ++
drivers/mmc/host/dw_mmc-k3.c | 2 ++
drivers/mmc/host/dw_mmc-pltfm.c | 2 ++
3 files changed, 6 insertions(+)
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index d46c3439b508..8a75d7314606 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -554,6 +554,8 @@ static int dw_mci_exynos_probe(struct platform_device *pdev)
int ret;
match = of_match_node(dw_mci_exynos_match, pdev->dev.of_node);
+ if (!match)
+ return -ENXIO;
drv_data = match->data;
pm_runtime_get_noresume(&pdev->dev);
diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c
index 89cdb3d533bb..cc50b7546a20 100644
--- a/drivers/mmc/host/dw_mmc-k3.c
+++ b/drivers/mmc/host/dw_mmc-k3.c
@@ -459,6 +459,8 @@ static int dw_mci_k3_probe(struct platform_device *pdev)
const struct of_device_id *match;
match = of_match_node(dw_mci_k3_match, pdev->dev.of_node);
+ if (!match)
+ return -ENXIO;
drv_data = match->data;
return dw_mci_pltfm_register(pdev, drv_data);
diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 58c13e21bd5a..b1948989f617 100644
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -82,6 +82,8 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev)
if (pdev->dev.of_node) {
match = of_match_node(dw_mci_pltfm_match, pdev->dev.of_node);
+ if (!match)
+ return -ENXIO;
drv_data = match->data;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mmc: dw_mmc: Fix to avoid potential NULL pointer dereference【请注意，邮件由linux-mmc-owner@vger.kernel.org代发】
2019-03-19 0:19 [PATCH] mmc: dw_mmc: Fix to avoid potential NULL pointer dereference Aditya Pakki
@ 2019-03-19 0:43 ` Shawn Lin
0 siblings, 0 replies; 2+ messages in thread
From: Shawn Lin @ 2019-03-19 0:43 UTC (permalink / raw)
To: Aditya Pakki
Cc: shawn.lin, kjlu, Jaehoon Chung, Ulf Hansson, Kukjin Kim,
Krzysztof Kozlowski, linux-mmc, linux-arm-kernel,
linux-samsung-soc, linux-kernel
On 2019/3/19 8:19, Aditya Pakki wrote:
> of_match_node can fail and return NULL in case no matching structure.
> The patches checks for such a scenario and returns -ENXIO.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
> drivers/mmc/host/dw_mmc-exynos.c | 2 ++
> drivers/mmc/host/dw_mmc-k3.c | 2 ++
> drivers/mmc/host/dw_mmc-pltfm.c | 2 ++
> 3 files changed, 6 insertions(+)
>
Could you check dw_mmc-zx.c and dw_mmc-rockchip.c as well?
> diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
> index d46c3439b508..8a75d7314606 100644
> --- a/drivers/mmc/host/dw_mmc-exynos.c
> +++ b/drivers/mmc/host/dw_mmc-exynos.c
> @@ -554,6 +554,8 @@ static int dw_mci_exynos_probe(struct platform_device *pdev)
> int ret;
>
> match = of_match_node(dw_mci_exynos_match, pdev->dev.of_node);
> + if (!match)
> + return -ENXIO;
> drv_data = match->data;
>
> pm_runtime_get_noresume(&pdev->dev);
> diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c
> index 89cdb3d533bb..cc50b7546a20 100644
> --- a/drivers/mmc/host/dw_mmc-k3.c
> +++ b/drivers/mmc/host/dw_mmc-k3.c
> @@ -459,6 +459,8 @@ static int dw_mci_k3_probe(struct platform_device *pdev)
> const struct of_device_id *match;
>
> match = of_match_node(dw_mci_k3_match, pdev->dev.of_node);
> + if (!match)
> + return -ENXIO;
> drv_data = match->data;
>
> return dw_mci_pltfm_register(pdev, drv_data);
> diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
> index 58c13e21bd5a..b1948989f617 100644
> --- a/drivers/mmc/host/dw_mmc-pltfm.c
> +++ b/drivers/mmc/host/dw_mmc-pltfm.c
> @@ -82,6 +82,8 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev)
>
> if (pdev->dev.of_node) {
> match = of_match_node(dw_mci_pltfm_match, pdev->dev.of_node);
> + if (!match)
> + return -ENXIO;
> drv_data = match->data;
> }
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-19 0:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-19 0:19 [PATCH] mmc: dw_mmc: Fix to avoid potential NULL pointer dereference Aditya Pakki
2019-03-19 0:43 ` [PATCH] mmc: dw_mmc: Fix to avoid potential NULL pointer dereference【请注意，邮件由linux-mmc-owner@vger.kernel.org代发】 Shawn Lin
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).