OSDN Git Service

mmc: core: Fix NULL ptr crash from mmc_should_fail_request
authorRitesh Harjani <riteshh@codeaurora.org>
Fri, 22 Feb 2019 13:51:34 +0000 (19:21 +0530)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 27 Feb 2019 09:00:17 +0000 (10:00 +0100)
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@codeaurora.org>
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/core/core.c

index 5bd58b9..b27a1e6 100644 (file)
@@ -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;