Commit f04086c2 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card() 



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: 5fc3d80e ("mmc: sdio: don't use rocr to check if the card could support UHS mode")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200430091640.455-2-ulf.hansson@linaro.org
parent c2b613d0

drivers/mmc/core/sdio.c

+1 −2
Original line number Diff line number Diff line
@@ -718,9 +718,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, 
			/* Retry init sequence, but without R4_18V_PRESENT. */

			retries = 0;

			goto try_again;

		} else {

			goto remove;

		}

		return err;

	}



	/*