Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame^] | 1 | From db916870a839346767b6d5ca7d0eed3128ba5fea Mon Sep 17 00:00:00 2001 |
| 2 | From: Bin Meng <bmeng.cn@gmail.com> |
| 3 | Date: Wed, 3 Mar 2021 20:26:39 +0800 |
| 4 | Subject: [PATCH 6/6] hw/sd: sdhci: Reset the data pointer of s->fifo_buffer[] |
| 5 | when a different block size is programmed |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| 10 | If the block size is programmed to a different value from the |
| 11 | previous one, reset the data pointer of s->fifo_buffer[] so that |
| 12 | s->fifo_buffer[] can be filled in using the new block size in |
| 13 | the next transfer. |
| 14 | |
| 15 | With this fix, the following reproducer: |
| 16 | |
| 17 | outl 0xcf8 0x80001010 |
| 18 | outl 0xcfc 0xe0000000 |
| 19 | outl 0xcf8 0x80001001 |
| 20 | outl 0xcfc 0x06000000 |
| 21 | write 0xe000002c 0x1 0x05 |
| 22 | write 0xe0000005 0x1 0x02 |
| 23 | write 0xe0000007 0x1 0x01 |
| 24 | write 0xe0000028 0x1 0x10 |
| 25 | write 0x0 0x1 0x23 |
| 26 | write 0x2 0x1 0x08 |
| 27 | write 0xe000000c 0x1 0x01 |
| 28 | write 0xe000000e 0x1 0x20 |
| 29 | write 0xe000000f 0x1 0x00 |
| 30 | write 0xe000000c 0x1 0x32 |
| 31 | write 0xe0000004 0x2 0x0200 |
| 32 | write 0xe0000028 0x1 0x00 |
| 33 | write 0xe0000003 0x1 0x40 |
| 34 | |
| 35 | cannot be reproduced with the following QEMU command line: |
| 36 | |
| 37 | $ qemu-system-x86_64 -nographic -machine accel=qtest -m 512M \ |
| 38 | -nodefaults -device sdhci-pci,sd-spec-version=3 \ |
| 39 | -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive \ |
| 40 | -device sd-card,drive=mydrive -qtest stdio |
| 41 | |
| 42 | Cc: qemu-stable@nongnu.org |
| 43 | Fixes: CVE-2020-17380 |
| 44 | Fixes: CVE-2020-25085 |
| 45 | Fixes: CVE-2021-3409 |
| 46 | Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller") |
| 47 | Reported-by: Alexander Bulekov <alxndr@bu.edu> |
| 48 | Reported-by: Cornelius Aschermann (Ruhr-Universität Bochum) |
| 49 | Reported-by: Sergej Schumilo (Ruhr-Universität Bochum) |
| 50 | Reported-by: Simon Wörner (Ruhr-Universität Bochum) |
| 51 | Buglink: https://bugs.launchpad.net/qemu/+bug/1892960 |
| 52 | Buglink: https://bugs.launchpad.net/qemu/+bug/1909418 |
| 53 | Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1928146 |
| 54 | Tested-by: Alexander Bulekov <alxndr@bu.edu> |
| 55 | Signed-off-by: Bin Meng <bmeng.cn@gmail.com> |
| 56 | Message-Id: <20210303122639.20004-6-bmeng.cn@gmail.com> |
| 57 | Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> |
| 58 | |
| 59 | Upstream-Status: Backport [cffb446e8fd19a14e1634c7a3a8b07be3f01d5c9] |
| 60 | CVE: CVE-2021-3409 |
| 61 | |
| 62 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
| 63 | --- |
| 64 | hw/sd/sdhci.c | 12 ++++++++++++ |
| 65 | 1 file changed, 12 insertions(+) |
| 66 | |
| 67 | diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c |
| 68 | index 6c780126e..216842420 100644 |
| 69 | --- a/hw/sd/sdhci.c |
| 70 | +++ b/hw/sd/sdhci.c |
| 71 | @@ -1140,6 +1140,8 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) |
| 72 | break; |
| 73 | case SDHC_BLKSIZE: |
| 74 | if (!TRANSFERRING_DATA(s->prnsts)) { |
| 75 | + uint16_t blksize = s->blksize; |
| 76 | + |
| 77 | MASKED_WRITE(s->blksize, mask, extract32(value, 0, 12)); |
| 78 | MASKED_WRITE(s->blkcnt, mask >> 16, value >> 16); |
| 79 | |
| 80 | @@ -1151,6 +1153,16 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) |
| 81 | |
| 82 | s->blksize = deposit32(s->blksize, 0, 12, s->buf_maxsz); |
| 83 | } |
| 84 | + |
| 85 | + /* |
| 86 | + * If the block size is programmed to a different value from |
| 87 | + * the previous one, reset the data pointer of s->fifo_buffer[] |
| 88 | + * so that s->fifo_buffer[] can be filled in using the new block |
| 89 | + * size in the next transfer. |
| 90 | + */ |
| 91 | + if (blksize != s->blksize) { |
| 92 | + s->data_count = 0; |
| 93 | + } |
| 94 | } |
| 95 | |
| 96 | break; |
| 97 | -- |
| 98 | 2.29.2 |
| 99 | |