Skip to contentSkip to conversation

usb: ohci: limit the number of link eds

PATCH In review Li Qiang 1 participant 2 messages Feb 7, 2017 – Feb 15, 2017

lore
Share & tools
lore

Li Qiang

author
#0 lore raw

PATCH 1/1 usb: ohci: limit the number of link eds

From: Li Qiang <[email protected]>

The guest may builds an infinite loop with link eds. This patch limit the number of linked ed to avoid this.

---
 hw/usb/hcd-ohci.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
hw/usb/hcd-ohci.c +8 -1
index c82a92f..4a63f3b 100644
@@ -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.  */
Signature · 1 line
1.8.3.1
author
#1 lore raw

Hello Gerd,

Ping...

2017-02-07 18:23 GMT+08:00 Li Qiang <[email protected]>:

Quoted 50 lines

From: Li Qiang <[email protected]>

The guest may builds an infinite loop with link eds. This patch limit the number of linked ed to avoid this.

---
 hw/usb/hcd-ohci.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
hw/usb/hcd-ohci.c +3 -1
index c82a92f..4a63f3b 100644
@@ -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)
hw/usb/hcd-ohci.c +5 -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.  */

--
1.8.3.1