2021-12-29 02:38:23

by Wen Zhiwei

Subject: [PATCH] mmc: dw_mmc: Fix potential null pointer risk

we previously assumed 'host->slot' could be null,
null pointer judgment should be added

Signed-off-by: Wen Zhiwei <[email protected]>
---
drivers/mmc/host/dw_mmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index d977f34f6b55..c9dc8c168efb 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -3518,7 +3518,7 @@ int dw_mci_runtime_resume(struct device *dev)
mci_writel(host, CTRL, SDMMC_CTRL_INT_ENABLE);


- if (host->slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
+ if (host->slot && host->slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
dw_mci_set_ios(host->slot->mmc, &host->slot->mmc->ios);

/* Force setup bus to guarantee available clock output */
--
2.30.0

2021-12-30 08:35:03

by Jaehoon Chung

Subject: Re: [PATCH] mmc: dw_mmc: Fix potential null pointer risk

On 12/29/21 11:38 AM, Wen Zhiwei wrote:
> we previously assumed 'host->slot' could be null,
> null pointer judgment should be added
>
> Signed-off-by: Wen Zhiwei <[email protected]>

Reviewed-by: Jaehoon Chung <[email protected]>

Beset Regards,
Jaehoon Chung

> ---
> drivers/mmc/host/dw_mmc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index d977f34f6b55..c9dc8c168efb 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -3518,7 +3518,7 @@ int dw_mci_runtime_resume(struct device *dev)
> mci_writel(host, CTRL, SDMMC_CTRL_INT_ENABLE);
>
>
> - if (host->slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
> + if (host->slot && host->slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
> dw_mci_set_ios(host->slot->mmc, &host->slot->mmc->ios);
>
> /* Force setup bus to guarantee available clock output */
>

2022-01-24 19:22:57

by Ulf Hansson

Subject: Re: [PATCH] mmc: dw_mmc: Fix potential null pointer risk

On Wed, 29 Dec 2021 at 03:38, Wen Zhiwei <[email protected]> wrote:
>
> we previously assumed 'host->slot' could be null,
> null pointer judgment should be added
>
> Signed-off-by: Wen Zhiwei <[email protected]>

Applied for next, thanks!

Kind regards
Uffe


> ---
> drivers/mmc/host/dw_mmc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index d977f34f6b55..c9dc8c168efb 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -3518,7 +3518,7 @@ int dw_mci_runtime_resume(struct device *dev)
> mci_writel(host, CTRL, SDMMC_CTRL_INT_ENABLE);
>
>
> - if (host->slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
> + if (host->slot && host->slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
> dw_mci_set_ios(host->slot->mmc, &host->slot->mmc->ios);
>
> /* Force setup bus to guarantee available clock output */
> --
> 2.30.0
>