70 lines
2.4 KiB
Diff
70 lines
2.4 KiB
Diff
|
From: Bin Meng <bin.meng@windriver.com>
|
||
|
|
Date: Sat, 20 Feb 2021 16:58:13 +0800
|
||
|
|
Subject: hw/sd: sd: Actually perform the erase operation
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Git-commit: 818a5cdcfcf0a55d60b59b2cb74482ef4ba6b205
|
||
|
|
References: bsc#1175144, CVE-2020-17380, bsc#1176681, CVE-2020-25085
|
||
|
|
References: bsc#1182282, CVE-2021-3409
|
||
|
|
|
||
|
|
At present the sd_erase() does not erase the requested range of card
|
||
|
|
data to 0xFFs. Let's make the erase operation actually happen.
|
||
|
|
|
||
|
|
Signed-off-by: Bin Meng <bin.meng@windriver.com>
|
||
|
|
Message-Id: <1613811493-58815-1-git-send-email-bmeng.cn@gmail.com>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
hw/sd/sd.c | 22 +++++++++++++---------
|
||
|
|
1 file changed, 13 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
|
||
|
|
index 6719cda1a0db8e6afa04c2b23915..26a5ae4d202656b4d04547cac8b8 100644
|
||
|
|
--- a/hw/sd/sd.c
|
||
|
|
+++ b/hw/sd/sd.c
|
||
|
|
@@ -779,10 +779,12 @@ static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
|
||
|
|
|
||
|
|
static void sd_erase(SDState *sd)
|
||
|
|
{
|
||
|
|
- int i;
|
||
|
|
uint64_t erase_start = sd->erase_start;
|
||
|
|
uint64_t erase_end = sd->erase_end;
|
||
|
|
bool sdsc = true;
|
||
|
|
+ uint64_t wpnum;
|
||
|
|
+ uint64_t erase_addr;
|
||
|
|
+ int erase_len = 1 << HWBLOCK_SHIFT;
|
||
|
|
|
||
|
|
trace_sdcard_erase(sd->erase_start, sd->erase_end);
|
||
|
|
if (sd->erase_start == INVALID_ADDRESS
|
||
|
|
@@ -811,17 +813,19 @@ static void sd_erase(SDState *sd)
|
||
|
|
sd->erase_end = INVALID_ADDRESS;
|
||
|
|
sd->csd[14] |= 0x40;
|
||
|
|
|
||
|
|
- /* Only SDSC cards support write protect groups */
|
||
|
|
- if (sdsc) {
|
||
|
|
- erase_start = sd_addr_to_wpnum(erase_start);
|
||
|
|
- erase_end = sd_addr_to_wpnum(erase_end);
|
||
|
|
-
|
||
|
|
- for (i = erase_start; i <= erase_end; i++) {
|
||
|
|
- assert(i < sd->wpgrps_size);
|
||
|
|
- if (test_bit(i, sd->wp_groups)) {
|
||
|
|
+ memset(sd->data, 0xff, erase_len);
|
||
|
|
+ for (erase_addr = erase_start; erase_addr <= erase_end;
|
||
|
|
+ erase_addr += erase_len) {
|
||
|
|
+ if (sdsc) {
|
||
|
|
+ /* Only SDSC cards support write protect groups */
|
||
|
|
+ wpnum = sd_addr_to_wpnum(erase_addr);
|
||
|
|
+ assert(wpnum < sd->wpgrps_size);
|
||
|
|
+ if (test_bit(wpnum, sd->wp_groups)) {
|
||
|
|
sd->card_status |= WP_ERASE_SKIP;
|
||
|
|
+ continue;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+ BLK_WRITE_BLOCK(erase_addr, erase_len);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|