hw/sd: sd: Fix address check in sd_erase()

For high capacity memory cards, the erase start address and end
address are multiplied by 512, but the address check is still
based on the original block number in sd->erase_{start, end}.

Fixes: 1bd6fd8ed5 ("hw/sd/sdcard: Do not attempt to erase out of range addresses")
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210216150225.27996-2-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Bin Meng 2021-02-16 23:02:18 +08:00 committed by Philippe Mathieu-Daudé
parent 17674695ab
commit 64ea2d9f74

View File

@ -760,7 +760,7 @@ static void sd_erase(SDState *sd)
erase_end *= 512;
}
if (sd->erase_start > sd->size || sd->erase_end > sd->size) {
if (erase_start > sd->size || erase_end > sd->size) {
sd->card_status |= OUT_OF_RANGE;
sd->erase_start = INVALID_ADDRESS;
sd->erase_end = INVALID_ADDRESS;