Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame^] | 1 | From 405ca416ccc8135544a4fe5732974497244128c9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bin Meng <bmeng.cn@gmail.com> |
| 3 | Date: Wed, 3 Mar 2021 20:26:36 +0800 |
| 4 | Subject: [PATCH 3/6] hw/sd: sdhci: Don't write to SDHC_SYSAD register when |
| 5 | transfer is in progress |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| 10 | Per "SD Host Controller Standard Specification Version 7.00" |
| 11 | chapter 2.2.1 SDMA System Address Register: |
| 12 | |
| 13 | This register can be accessed only if no transaction is executing |
| 14 | (i.e., after a transaction has stopped). |
| 15 | |
| 16 | With this fix, the following reproducer: |
| 17 | |
| 18 | outl 0xcf8 0x80001010 |
| 19 | outl 0xcfc 0xfbefff00 |
| 20 | outl 0xcf8 0x80001001 |
| 21 | outl 0xcfc 0x06000000 |
| 22 | write 0xfbefff2c 0x1 0x05 |
| 23 | write 0xfbefff0f 0x1 0x37 |
| 24 | write 0xfbefff0a 0x1 0x01 |
| 25 | write 0xfbefff0f 0x1 0x29 |
| 26 | write 0xfbefff0f 0x1 0x02 |
| 27 | write 0xfbefff0f 0x1 0x03 |
| 28 | write 0xfbefff04 0x1 0x01 |
| 29 | write 0xfbefff05 0x1 0x01 |
| 30 | write 0xfbefff07 0x1 0x02 |
| 31 | write 0xfbefff0c 0x1 0x33 |
| 32 | write 0xfbefff0e 0x1 0x20 |
| 33 | write 0xfbefff0f 0x1 0x00 |
| 34 | write 0xfbefff2a 0x1 0x01 |
| 35 | write 0xfbefff0c 0x1 0x00 |
| 36 | write 0xfbefff03 0x1 0x00 |
| 37 | write 0xfbefff05 0x1 0x00 |
| 38 | write 0xfbefff2a 0x1 0x02 |
| 39 | write 0xfbefff0c 0x1 0x32 |
| 40 | write 0xfbefff01 0x1 0x01 |
| 41 | write 0xfbefff02 0x1 0x01 |
| 42 | write 0xfbefff03 0x1 0x01 |
| 43 | |
| 44 | cannot be reproduced with the following QEMU command line: |
| 45 | |
| 46 | $ qemu-system-x86_64 -nographic -machine accel=qtest -m 512M \ |
| 47 | -nodefaults -device sdhci-pci,sd-spec-version=3 \ |
| 48 | -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive \ |
| 49 | -device sd-card,drive=mydrive -qtest stdio |
| 50 | |
| 51 | Cc: qemu-stable@nongnu.org |
| 52 | Fixes: CVE-2020-17380 |
| 53 | Fixes: CVE-2020-25085 |
| 54 | Fixes: CVE-2021-3409 |
| 55 | Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller") |
| 56 | Reported-by: Alexander Bulekov <alxndr@bu.edu> |
| 57 | Reported-by: Cornelius Aschermann (Ruhr-Universität Bochum) |
| 58 | Reported-by: Sergej Schumilo (Ruhr-Universität Bochum) |
| 59 | Reported-by: Simon Wörner (Ruhr-Universität Bochum) |
| 60 | Buglink: https://bugs.launchpad.net/qemu/+bug/1892960 |
| 61 | Buglink: https://bugs.launchpad.net/qemu/+bug/1909418 |
| 62 | Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1928146 |
| 63 | Tested-by: Alexander Bulekov <alxndr@bu.edu> |
| 64 | Signed-off-by: Bin Meng <bmeng.cn@gmail.com> |
| 65 | Message-Id: <20210303122639.20004-3-bmeng.cn@gmail.com> |
| 66 | Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> |
| 67 | |
| 68 | Upstream-Status: Backport [8be45cc947832b3c02144c9d52921f499f2d77fe] |
| 69 | CVE: CVE-2021-3409 |
| 70 | |
| 71 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
| 72 | --- |
| 73 | hw/sd/sdhci.c | 20 +++++++++++--------- |
| 74 | 1 file changed, 11 insertions(+), 9 deletions(-) |
| 75 | |
| 76 | diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c |
| 77 | index 44f8a82ea..d8a46f307 100644 |
| 78 | --- a/hw/sd/sdhci.c |
| 79 | +++ b/hw/sd/sdhci.c |
| 80 | @@ -1121,15 +1121,17 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) |
| 81 | |
| 82 | switch (offset & ~0x3) { |
| 83 | case SDHC_SYSAD: |
| 84 | - s->sdmasysad = (s->sdmasysad & mask) | value; |
| 85 | - MASKED_WRITE(s->sdmasysad, mask, value); |
| 86 | - /* Writing to last byte of sdmasysad might trigger transfer */ |
| 87 | - if (!(mask & 0xFF000000) && TRANSFERRING_DATA(s->prnsts) && s->blkcnt && |
| 88 | - s->blksize && SDHC_DMA_TYPE(s->hostctl1) == SDHC_CTRL_SDMA) { |
| 89 | - if (s->trnmod & SDHC_TRNS_MULTI) { |
| 90 | - sdhci_sdma_transfer_multi_blocks(s); |
| 91 | - } else { |
| 92 | - sdhci_sdma_transfer_single_block(s); |
| 93 | + if (!TRANSFERRING_DATA(s->prnsts)) { |
| 94 | + s->sdmasysad = (s->sdmasysad & mask) | value; |
| 95 | + MASKED_WRITE(s->sdmasysad, mask, value); |
| 96 | + /* Writing to last byte of sdmasysad might trigger transfer */ |
| 97 | + if (!(mask & 0xFF000000) && s->blkcnt && s->blksize && |
| 98 | + SDHC_DMA_TYPE(s->hostctl1) == SDHC_CTRL_SDMA) { |
| 99 | + if (s->trnmod & SDHC_TRNS_MULTI) { |
| 100 | + sdhci_sdma_transfer_multi_blocks(s); |
| 101 | + } else { |
| 102 | + sdhci_sdma_transfer_single_block(s); |
| 103 | + } |
| 104 | } |
| 105 | } |
| 106 | break; |
| 107 | -- |
| 108 | 2.29.2 |
| 109 | |