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
84 lines
2.8 KiB
Diff
84 lines
2.8 KiB
Diff
From: Bin Meng <bin.meng@windriver.com>
|
|
Date: Tue, 16 Feb 2021 23:02:21 +0800
|
|
Subject: hw/sd: sd: Move the sd_block_{read, write} and macros ahead
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: ce6ea2efc5fb308ebf11339276f60215fe0ec44c
|
|
References: bsc#1175144, CVE-2020-17380, bsc#1176681, CVE-2020-25085
|
|
References: bsc#1182282, CVE-2021-3409
|
|
|
|
These APIs and macros may be referenced by functions that are
|
|
currently before them. Move them ahead a little bit.
|
|
|
|
Signed-off-by: Bin Meng <bin.meng@windriver.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Message-Id: <20210216150225.27996-5-bmeng.cn@gmail.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/sd/sd.c | 42 +++++++++++++++++++++---------------------
|
|
1 file changed, 21 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
|
|
index 5cdcd54cfcbf467342b2e485ac3e..ac48140251de7845a01ab4ad656c 100644
|
|
--- a/hw/sd/sd.c
|
|
+++ b/hw/sd/sd.c
|
|
@@ -755,6 +755,27 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
|
|
qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0);
|
|
}
|
|
|
|
+static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
|
|
+{
|
|
+ trace_sdcard_read_block(addr, len);
|
|
+ if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) {
|
|
+ fprintf(stderr, "sd_blk_read: read error on host side\n");
|
|
+ }
|
|
+}
|
|
+
|
|
+static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
|
|
+{
|
|
+ trace_sdcard_write_block(addr, len);
|
|
+ if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) {
|
|
+ fprintf(stderr, "sd_blk_write: write error on host side\n");
|
|
+ }
|
|
+}
|
|
+
|
|
+#define BLK_READ_BLOCK(a, len) sd_blk_read(sd, a, len)
|
|
+#define BLK_WRITE_BLOCK(a, len) sd_blk_write(sd, a, len)
|
|
+#define APP_READ_BLOCK(a, len) memset(sd->data, 0xec, len)
|
|
+#define APP_WRITE_BLOCK(a, len)
|
|
+
|
|
static void sd_erase(SDState *sd)
|
|
{
|
|
int i;
|
|
@@ -1815,27 +1836,6 @@ send_response:
|
|
return rsplen;
|
|
}
|
|
|
|
-static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
|
|
-{
|
|
- trace_sdcard_read_block(addr, len);
|
|
- if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) {
|
|
- fprintf(stderr, "sd_blk_read: read error on host side\n");
|
|
- }
|
|
-}
|
|
-
|
|
-static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
|
|
-{
|
|
- trace_sdcard_write_block(addr, len);
|
|
- if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) {
|
|
- fprintf(stderr, "sd_blk_write: write error on host side\n");
|
|
- }
|
|
-}
|
|
-
|
|
-#define BLK_READ_BLOCK(a, len) sd_blk_read(sd, a, len)
|
|
-#define BLK_WRITE_BLOCK(a, len) sd_blk_write(sd, a, len)
|
|
-#define APP_READ_BLOCK(a, len) memset(sd->data, 0xec, len)
|
|
-#define APP_WRITE_BLOCK(a, len)
|
|
-
|
|
void sd_write_byte(SDState *sd, uint8_t value)
|
|
{
|
|
int i;
|