Received-SPF: pass (google.com: domain of linux-kernel+bounces-95370-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240307085135.16245-1-amishin@t-argos.ru>
In-Reply-To: <20240307085135.16245-1-amishin@t-argos.ru>
From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Thu, 7 Mar 2024 11:57:16 +0100
Message-ID: <CAPDyKFoYRT=P+4L+5ciNPxEHcS7hoXPef__NQoodxkSy=39Teg@mail.gmail.com>
Subject: Re: [PATCH] mmc: dw_mmc: Fix potential null pointer risk
To: Aleksandr Mishin <amishin@t-argos.ru>
Cc: Jaehoon Chung <jh80.chung@samsung.com>, Wen Zhiwei <wenzhiwei@kylinos.cn>, 
	linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, 
	lvc-project@linuxtesting.org
Content-Type: text/plain; charset="UTF-8"

On Thu, 7 Mar 2024 at 09:53, Aleksandr Mishin <amishin@t-argos.ru> wrote:
>
> In dw_mci_runtime_resume() 'host->slot' could be null, but check is not cover all corresponding code.
> Fix this bug by changing check place.

In fact host->slot can never be NULL in dw_mci_runtime_resume() or in
dw_mci_runtime_suspend().

A better fix would thus be to remove the redundant checks.

Kind regards
Uffe

>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 4a835afd808a (mmc: dw_mmc: Fix potential null pointer risk)
> Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
> ---
>  drivers/mmc/host/dw_mmc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 829af2c98a44..a4f124452abc 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -3570,8 +3570,10 @@ int dw_mci_runtime_resume(struct device *dev)
>                    DW_MCI_ERROR_FLAGS);
>         mci_writel(host, CTRL, SDMMC_CTRL_INT_ENABLE);
>
> +       if (!host->slot)
> +               goto err;
>
> -       if (host->slot && host->slot->mmc->pm_flags & MMC_PM_KEEP_POWER)
> +       if (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.2
>
>