On Fri, 22 Feb 2019 at 14:51, Ritesh Harjani <riteshh@xxxxxxxxxxxxxx> wrote:
>
> In case of CQHCI, mrq->cmd may be NULL for data requests (non DCMD).
> In such case mmc_should_fail_request is directly dereferencing
> mrq->cmd while cmd is NULL.
> Fix this by checking for mrq->cmd pointer.
>
> Fixes: 72a5af554df8 ("mmc: core: Add support for handling CQE requests")
> Signed-off-by: Ritesh Harjani <riteshh@xxxxxxxxxxxxxx>
Applied for fixes and by adding a stable tag, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/core/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index de0f1a1..4a66087 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -95,7 +95,7 @@ static void mmc_should_fail_request(struct mmc_host *host,
> if (!data)
> return;
>
> - if (cmd->error || data->error ||
> + if ((cmd && cmd->error) || data->error ||
> !should_fail(&host->fail_mmc_request, data->blksz * data->blocks))
> return;
>
> --
> The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> a Linux Foundation Collaborative Project.
>
