diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2020-09-01 15:22:06 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2020-10-21 13:19:01 +0200 |
| commit | dfba99f17feb6d4a129da19d38df1bcd8579d1c3 (patch) | |
| tree | 7da3cd78ad1761eeac8913c8c80730735cde1c67 /hw/sd | |
| parent | 598a40b30f13b3cde6764173449671d0d8c4d058 (diff) | |
| download | qemu-dfba99f17feb6d4a129da19d38df1bcd8579d1c3.zip qemu-dfba99f17feb6d4a129da19d38df1bcd8579d1c3.tar.gz qemu-dfba99f17feb6d4a129da19d38df1bcd8579d1c3.tar.bz2 | |
hw/sd/sdhci: Fix DMA Transfer Block Size field
The 'Transfer Block Size' field is 12-bit wide.
See section '2.2.2. Block Size Register (Offset 004h)' in datasheet.
Two different bug reproducer available:
- https://bugs.launchpad.net/qemu/+bug/1892960
- https://ruhr-uni-bochum.sciebo.de/s/NNWP2GfwzYKeKwE?path=%2Fsdhci_oob_write1
Cc: qemu-stable@nongnu.org
Buglink: https://bugs.launchpad.net/qemu/+bug/1892960
Fixes: d7dfca0807a ("hw/sdhci: introduce standard SD host controller")
Reported-by: Alexander Bulekov <alxndr@bu.edu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Prasad J Pandit <pjp@fedoraproject.org>
Tested-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20200901140411.112150-3-f4bug@amsat.org>
Diffstat (limited to 'hw/sd')
| -rw-r--r-- | hw/sd/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ed717ab..c849c3d 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1107,7 +1107,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) break; case SDHC_BLKSIZE: if (!TRANSFERRING_DATA(s->prnsts)) { - MASKED_WRITE(s->blksize, mask, value); + MASKED_WRITE(s->blksize, mask, extract32(value, 0, 12)); MASKED_WRITE(s->blkcnt, mask >> 16, value >> 16); } |