eaa6ce4fe2
CVE-2017-5525: audio: memory leakage in ac97 (bz #1414110) CVE-2017-5526: audio: memory leakage in es1370 (bz #1414210) CVE-2016-10155 watchdog: memory leakage in i6300esb (bz #1415200) CVE-2017-5552: virtio-gpu-3d: memory leakage (bz #1415283) CVE-2017-5578: virtio-gpu: memory leakage (bz #1415797) CVE-2017-5667: sd: sdhci OOB access during multi block transfer (bz #1417560) CVE-2017-5856: scsi: megasas: memory leakage (bz #1418344) CVE-2017-5857: virtio-gpu-3d: host memory leakage in virgl_cmd_resource_unref (bz #1418383) CVE-2017-5898: usb: integer overflow in emulated_apdu_from_guest (bz #1419700) CVE-2017-5987: sd: infinite loop issue in multi block transfers (bz #1422001) CVE-2017-6058: vmxnet3: OOB access when doing vlan stripping (bz #1423359) CVE-2017-6505: usb: an infinite loop issue in ohci_service_ed_list (bz #1429434) CVE-2017-2615: cirrus: oob access while doing bitblt copy backward (bz #1418206) CVE-2017-2620: cirrus: potential arbitrary code execution (bz #1425419) Fix spice GL with new mesa/libglvnd (bz #1431905)
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Tue, 7 Feb 2017 18:29:59 +0000
|
|
Subject: [PATCH] sd: sdhci: check data length during dma_memory_read
|
|
|
|
While doing multi block SDMA transfer in routine
|
|
'sdhci_sdma_transfer_multi_blocks', the 's->fifo_buffer' starting
|
|
index 'begin' and data length 's->data_count' could end up to be same.
|
|
This could lead to an OOB access issue. Correct transfer data length
|
|
to avoid it.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Reported-by: Jiang Xin <jiangxin1@huawei.com>
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Message-id: 20170130064736.9236-1-ppandit@redhat.com
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
(cherry picked from commit 42922105beb14c2fc58185ea022b9f72fb5465e9)
|
|
---
|
|
hw/sd/sdhci.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
|
|
index 01fbf22..5bd5ab6 100644
|
|
--- a/hw/sd/sdhci.c
|
|
+++ b/hw/sd/sdhci.c
|
|
@@ -536,7 +536,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s)
|
|
boundary_count -= block_size - begin;
|
|
}
|
|
dma_memory_read(&address_space_memory, s->sdmasysad,
|
|
- &s->fifo_buffer[begin], s->data_count);
|
|
+ &s->fifo_buffer[begin], s->data_count - begin);
|
|
s->sdmasysad += s->data_count - begin;
|
|
if (s->data_count == block_size) {
|
|
for (n = 0; n < block_size; n++) {
|