diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2020-04-30 11:16:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-17 16:42:08 +0200 |
| commit | e0f61e3ab2d8d99f92dac85615b0e962121d6d24 (patch) | |
| tree | 4a068fdad8c0bd75982a59f82cafae8fcf2ed065 | |
| parent | 380b60cd3c25d2f1db17ed66ca70ff6fc50baae4 (diff) | |
| download | linux-stable-e0f61e3ab2d8d99f92dac85615b0e962121d6d24.tar.gz linux-stable-e0f61e3ab2d8d99f92dac85615b0e962121d6d24.zip | |
mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card()
commit f04086c225da11ad16d7f9a2fbca6483ab16dded upstream.
During some scenarios mmc_sdio_init_card() runs a retry path for the UHS-I
specific initialization, which leads to removal of the previously allocated
card. A new card is then re-allocated while retrying.
However, in one of the corresponding error paths we may end up to remove an
already removed card, which likely leads to a NULL pointer exception. So,
let's fix this.
Fixes: 5fc3d80ef496 ("mmc: sdio: don't use rocr to check if the card could support UHS mode")
Cc: <stable@vger.kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200430091640.455-2-ulf.hansson@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/mmc/core/sdio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index ebb387aa5158..d35679e6e6aa 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -718,9 +718,8 @@ try_again: /* Retry init sequence, but without R4_18V_PRESENT. */ retries = 0; goto try_again; - } else { - goto remove; } + return err; } /* |