[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] usb-hub: limit chain length
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 07/10] usb-hub: limit chain length |
Date: |
Wed, 3 Apr 2013 11:43:37 +0200 |
USB supports up to 5 hubs chained.
Catch attempts to chain more.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb.h | 1 +
hw/usb/bus.c | 2 ++
hw/usb/dev-hub.c | 6 ++++++
3 files changed, 9 insertions(+)
diff --git a/hw/usb.h b/hw/usb.h
index 1b10684..4d9d05e 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -337,6 +337,7 @@ typedef struct USBPortOps {
struct USBPort {
USBDevice *dev;
int speedmask;
+ int hubcount;
char path[16];
USBPortOps *ops;
void *opaque;
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index e58cd9a..b10c290 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -341,8 +341,10 @@ void usb_port_location(USBPort *downstream, USBPort
*upstream, int portnr)
if (upstream) {
snprintf(downstream->path, sizeof(downstream->path), "%s.%d",
upstream->path, portnr);
+ downstream->hubcount = upstream->hubcount + 1;
} else {
snprintf(downstream->path, sizeof(downstream->path), "%d", portnr);
+ downstream->hubcount = 0;
}
}
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 504c98c..a5f092b 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -25,6 +25,7 @@
#include "trace.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
+#include "qemu/error-report.h"
#define NUM_PORTS 8
@@ -514,6 +515,11 @@ static int usb_hub_initfn(USBDevice *dev)
USBHubPort *port;
int i;
+ if (dev->port->hubcount == 5) {
+ error_report("usb hub chain too deep");
+ return -1;
+ }
+
usb_desc_create_serial(dev);
usb_desc_init(dev);
s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
--
1.7.9.7
- [Qemu-devel] [PULL 00/10] usb patch queue, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 04/10] xhci: remove leftover debug printf, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 06/10] xhci: zap unused name field, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 01/10] usb-redir: Fix crash on migration with no client connected, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 07/10] usb-hub: limit chain length,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 02/10] usb-redir: Add flow control support, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 08/10] usb-hub: report status changes only once, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 09/10] usb: update docs for bus name change, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 03/10] xhci: fix numintrs sanity checks, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 05/10] xhci: remove unimplemented printfs, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 10/10] usb-tablet: Don't claim wakeup capability for USB-2 version, Gerd Hoffmann, 2013/04/03