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)
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From: Li Qiang <liqiang6-s@360.cn>
|
|
Date: Tue, 7 Feb 2017 02:23:33 -0800
|
|
Subject: [PATCH] usb: ohci: limit the number of link eds
|
|
|
|
The guest may builds an infinite loop with link eds. This patch
|
|
limit the number of linked ed to avoid this.
|
|
|
|
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
|
|
Message-id: 5899a02e.45ca240a.6c373.93c1@mx.google.com
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit 95ed56939eb2eaa4e2f349fe6dcd13ca4edfd8fb)
|
|
---
|
|
hw/usb/hcd-ohci.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
|
|
index fa57038..48307fe 100644
|
|
--- a/hw/usb/hcd-ohci.c
|
|
+++ b/hw/usb/hcd-ohci.c
|
|
@@ -42,6 +42,8 @@
|
|
|
|
#define OHCI_MAX_PORTS 15
|
|
|
|
+#define ED_LINK_LIMIT 4
|
|
+
|
|
static int64_t usb_frame_time;
|
|
static int64_t usb_bit_time;
|
|
|
|
@@ -1184,7 +1186,7 @@ static int ohci_service_ed_list(OHCIState *ohci, uint32_t head, int completion)
|
|
uint32_t next_ed;
|
|
uint32_t cur;
|
|
int active;
|
|
-
|
|
+ uint32_t link_cnt = 0;
|
|
active = 0;
|
|
|
|
if (head == 0)
|
|
@@ -1199,6 +1201,11 @@ static int ohci_service_ed_list(OHCIState *ohci, uint32_t head, int completion)
|
|
|
|
next_ed = ed.next & OHCI_DPTR_MASK;
|
|
|
|
+ if (++link_cnt > ED_LINK_LIMIT) {
|
|
+ ohci_die(ohci);
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
if ((ed.head & OHCI_ED_H) || (ed.flags & OHCI_ED_K)) {
|
|
uint32_t addr;
|
|
/* Cancel pending packets for ED that have been paused. */
|