mmc: core: don't initialize block size from ext_csd if not present
authorPeter Collingbourne <pcc@google.com>
Thu, 14 Jan 2021 20:14:05 +0000 (12:14 -0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Fri, 15 Jan 2021 11:09:15 +0000 (12:09 +0100)
commitb503087445ce7e45fabdee87ca9e460d5b5b5168
tree3ae7a6a1321c492fd5c31a7436d0b647352621e8
parent5b191dcba719319148eeecf6ed409949fac55b39
mmc: core: don't initialize block size from ext_csd if not present

If extended CSD was not available, the eMMC driver would incorrectly
set the block size to 0, as the data_sector_size field of ext_csd
was never initialized. This issue was exposed by commit 817046ecddbc
("block: Align max_hw_sectors to logical blocksize") which caused
max_sectors and max_hw_sectors to be set to 0 after setting the block
size to 0, resulting in a kernel panic in bio_split when attempting
to read from the device. Fix it by only reading the block size from
ext_csd if it is available.

Fixes: a5075eb94837 ("mmc: block: Allow disabling 512B sector size emulation")
Signed-off-by: Peter Collingbourne <pcc@google.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Link: https://linux-review.googlesource.com/id/If244d178da4d86b52034459438fec295b02d6e60
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210114201405.2934886-1-pcc@google.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/core/queue.c