From: Philippe Mathieu-Daudé Date: Tue, 1 Sep 2020 13:22:06 +0000 (+0200) Subject: hw/sd/sdhci: Fix DMA Transfer Block Size field X-Git-Tag: upstream/4.2.1~80 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be50bff6f5f9c8b03912e38b54737fa874ba4413;p=tools%2Fqemu-arm-static.git hw/sd/sdhci: Fix DMA Transfer Block Size field Git-commit: dfba99f17feb6d4a129da19d38df1bcd8579d1c3 References: bsc#1176681 CVE-2020-25085 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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Prasad J Pandit Tested-by: Alexander Bulekov Message-Id: <20200901140411.112150-3-f4bug@amsat.org> Signed-off-by: Jose R Ziviani --- diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 88404d0e9..c27bd0936 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1129,7 +1129,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); }