summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/core/mmc.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 6eb9a4ddcee8..2ed77066e8d6 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -293,12 +293,13 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
}
}
- /*
- * The EXT_CSD format is meant to be forward compatible. As long
- * as CSD_STRUCTURE does not change, all values for EXT_CSD_REV
- * are authorized, see JEDEC JESD84-B50 section B.8.
- */
card->ext_csd.rev = ext_csd[EXT_CSD_REV];
+ if (card->ext_csd.rev > 7) {
+ pr_err("%s: unrecognised EXT_CSD revision %d\n",
+ mmc_hostname(card->host), card->ext_csd.rev);
+ err = -EINVAL;
+ goto out;
+ }
card->ext_csd.raw_sectors[0] = ext_csd[EXT_CSD_SEC_CNT + 0];
card->ext_csd.raw_sectors[1] = ext_csd[EXT_CSD_SEC_CNT + 1];