86ffd40d11
- Switch method of splitting off hw-s390x-virtio-gpu-ccw.so as a module to what was accepted upstream (bsc#1181103) * Patches dropped: hw-s390x-modularize-virtio-gpu-ccw.patch * Patches added: s390x-add-have_virtio_ccw.patch s390x-modularize-virtio-gpu-ccw.patch s390x-move-S390_ADAPTER_SUPPRESSIBLE.patch - Fix OOB access in sdhci interface (CVE-2020-17380, bsc#1175144, CVE-2020-25085, bsc#1176681, CVE-2021-3409, bsc#1182282) hw-sd-sd-Actually-perform-the-erase-oper.patch hw-sd-sd-Fix-build-error-when-DEBUG_SD-i.patch hw-sd-sdhci-Correctly-set-the-controller.patch hw-sd-sdhci-Don-t-transfer-any-data-when.patch hw-sd-sdhci-Don-t-write-to-SDHC_SYSAD-re.patch hw-sd-sdhci-Limit-block-size-only-when-S.patch hw-sd-sdhci-Reset-the-data-pointer-of-s-.patch hw-sd-sd-Move-the-sd_block_-read-write-a.patch hw-sd-sd-Skip-write-protect-groups-check.patch - Fix potential privilege escalation in virtiofsd tool (CVE-2021-20263, bsc#1183373) tools-virtiofsd-Replace-the-word-whiteli.patch viriofsd-Add-support-for-FUSE_HANDLE_KIL.patch virtiofsd-extract-lo_do_open-from-lo_ope.patch virtiofsd-optionally-return-inode-pointe.patch virtiofsd-prevent-opening-of-special-fil.patch virtiofs-drop-remapped-security.capabili.patch virtiofsd-Save-error-code-early-at-the-f.patch - Fix OOB access (stack overflow) in rtl8139 NIC emulation (CVE-2021-3416, bsc#1182968) net-introduce-qemu_receive_packet.patch rtl8139-switch-to-use-qemu_receive_packe.patch - Fix OOB access (stack overflow) in other NIC emulations (CVE-2021-3416) cadence_gem-switch-to-use-qemu_receive_p.patch dp8393x-switch-to-use-qemu_receive_packe.patch e1000-switch-to-use-qemu_receive_packet-.patch lan9118-switch-to-use-qemu_receive_packe.patch msf2-mac-switch-to-use-qemu_receive_pack.patch pcnet-switch-to-use-qemu_receive_packet-.patch sungem-switch-to-use-qemu_receive_packet.patch tx_pkt-switch-to-use-qemu_receive_packet.patch - Fix heap overflow in MSIx emulation (CVE-2020-27821, bsc#1179686) memory-clamp-cached-translation-in-case-.patch - Include upstream patches designated as stable material and reviewed for applicability to include here hw-arm-virt-Disable-pl011-clock-migratio.patch xen-block-Fix-removal-of-backend-instanc.patch - Fix package scripts to not use hard coded paths for temporary working directories and log files (bsc#1182425) OBS-URL: https://build.opensuse.org/request/show/882222 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=632
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);
|
|
}
|
|
}
|
|
|