Guest OS hangs on usb_add
PATCH v2 1/1 Guest OS hangs on usb_add
Doesn't look like this has ever been committed. qemu-kvm-0.13 has just arrived to the portage tree, but I am still having problems with it. I checked the git log and it's not there! Please commit.
-TJ
-------- Original Message --------
Subject: [PATCH v2] Guest OS hangs on usb_add
Date: Mon, 28 Jun 2010 10:47:03 -0400
From: TJ <[email protected]>
To: [email protected] <[email protected]>
CC: Gianni Tedesco <[email protected]>
This is a small patch to sligtly "intelligentify" usb device and config descriptor parsing and to handle bug with certain usb device (URC MX-950) reporting device desriptor length as 0x18 instead of 18 with added vendor_id/product_id check
--- hw/usb.h | 5 +++++ usb-linux.c | 37 ++++++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 15 deletions(-)
hw/usb.h +5 -0
@@ -117,6 +117,11 @@#define USB_DT_INTERFACE 0x04#define USB_DT_ENDPOINT 0x05 +#define USB_DT_DEVICE_LEN 18 +#define USB_DT_CONFIG_LEN 9 +#define USB_DT_INTERFACE_LEN 9 +#define USB_DT_ENDPOINT_LEN 7 +#define USB_ENDPOINT_XFER_CONTROL 0#define USB_ENDPOINT_XFER_ISOC 1#define USB_ENDPOINT_XFER_BULK 2
usb-linux.c +1 -1
@@ -288,7 +288,7 @@ static void async_cancel(USBPacket *unused, void *opaque)static int usb_host_claim_interfaces (USBHostDevice *dev,int configuration) { -int dev_descr_len, config_descr_len; +int dev_descr_len, config_descr_total_len;int interface, nb_interfaces;int ret, i;
@@ -297,32 +297,39 @@ static int usb_host_claim_interfaces(USBHostDevice *dev,
int configuration)
DPRINTF("husb: claiming interfaces. config %d\n", configuration);- i = 0;
dev_descr_len = dev->descr[0];- if (dev_descr_len > dev->descr_len) {
+ if (dev_descr_len == 0x18 && dev->descr[ 8] == 0x47 && dev->descr[ 9] == 0x46
+ && dev->descr[10] == 0x00 && dev->descr[11] == 0x30)
+ dev_descr_len = USB_DT_DEVICE_LEN; /* for buggy MX-950 remote reporting
len in hex */
+
+ if (dev_descr_len > dev->descr_len || dev_descr_len < USB_DT_DEVICE_LEN ||
dev->descr[1] != USB_DT_DEVICE) {
+ fprintf(stderr, "husb: invalid device descriptor\n");
goto fail;
}- i += dev_descr_len;
- while (i < dev->descr_len) {
+ for (i = dev_descr_len; i < dev->descr_len; ) {
DPRINTF("husb: i is %d, descr_len is %d, dl %d, dt %d\n",
i, dev->descr_len,
dev->descr[i], dev->descr[i+1]);- if (dev->descr[i+1] != USB_DT_CONFIG) {
- i += dev->descr[i];
- continue;
+ if (dev->descr[i] < 2) {
+ fprintf(stderr, "husb: invalid descriptor\n");
+ goto fail;
}- config_descr_len = dev->descr[i];
+ if (dev->descr[i+1] == USB_DT_CONFIG) {
+ config_descr_total_len = dev->descr[i+2] + (dev->descr[i+3] << 8);
- printf("husb: config #%d need %d\n", dev->descr[i + 5], configuration);
+ printf("husb: config #%d need %d\n", dev->descr[i + 5], configuration);
- if (configuration < 0 || configuration == dev->descr[i + 5]) {
- configuration = dev->descr[i + 5];
- break;
- }
+ if (configuration < 0 || configuration == dev->descr[i + 5]) {
+ configuration = dev->descr[i + 5];
+ break;
+ }
- i += config_descr_len;
+ i += config_descr_total_len;
+ }
+ else
+ i += dev->descr[i];
}
if (i >= dev->descr_len) {Quoted 4 lines · TJ
Doesn't look like this has ever been committed. qemu-kvm-0.13 has just arrived to the portage tree, but I am still having problems with it. I checked the git log and it's not there! Please commit.
One off device hacks are concerning because it's basically impossible to review.
Why does this work on bare metal?
Regards,
Anthony Liguori
Quoted 107 lines
-TJ
-------- Original Message --------
Subject: [PATCH v2] Guest OS hangs onusb_add
Date: Mon, 28 Jun 2010 10:47:03 -0400
From: TJ<[email protected]>
To: [email protected]<[email protected]>
CC: Gianni Tedesco<[email protected]>This is a small patch to sligtly "intelligentify" usb device and config descriptor parsing and to handle bug with certain usb device (URC MX-950) reporting device desriptor length as
0x18instead of 18 with added vendor_id/product_id check--- hw/usb.h | 5 +++++ usb-linux.c | 37 ++++++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 15 deletions(-)hw/usb.h +5
-0@@ -117,6 +117,11 @@#define USB_DT_INTERFACE 0x04#define USB_DT_ENDPOINT 0x05 +#define USB_DT_DEVICE_LEN 18 +#define USB_DT_CONFIG_LEN 9 +#define USB_DT_INTERFACE_LEN 9 +#define USB_DT_ENDPOINT_LEN 7 +#define USB_ENDPOINT_XFER_CONTROL 0#define USB_ENDPOINT_XFER_ISOC 1#define USB_ENDPOINT_XFER_BULK 2usb-linux.c +4
-3@@ -288,7 +288,7 @@ static void async_cancel(USBPacket *unused, void *opaque)static int usb_host_claim_interfaces (USBHostDevice *dev,int configuration) { -int dev_descr_len, config_descr_len; +int dev_descr_len, config_descr_total_len;int interface, nb_interfaces;int ret, i;@@ -297,32 +297,39 @@ static int usb_host_claim_interfaces(USBHostDevice *dev, int configuration) DPRINTF("husb: claiming interfaces. config %d\n", configuration); - i =0 ; dev_descr_len = dev->descr[0 ]; -if (dev_descr_len> dev->descr_len) { +if (dev_descr_len ==0x18 && dev->descr[8 ] ==0x47 && dev->descr[9 ] ==0x46 +&& dev->descr[10 ] ==0x00 && dev->descr[11 ] ==0x30 ) + dev_descr_len =USB_DT_DEVICE_LEN ;/* for buggy MX-950 remote reporting len in hex */
usb-linux.c +2
-0+ + if (dev_descr_len> dev->descr_len || dev_descr_len< USB_DT_DEVICE_LEN ||dev->descr[1] !=
USB_DT_DEVICE) {usb-linux.c +16
-12+fprintf (stderr,"husb: invalid device descriptor\n" ); goto fail; } - i += dev_descr_len; -while (i< dev->descr_len) { +for (i = dev_descr_len; i< dev->descr_len; ) {DPRINTF ("husb: i is %d, descr_len is %d, dl %d, dt %d\n" , i, dev->descr_len, dev->descr[i], dev->descr[i+1 ]); -if (dev->descr[i+1 ] !=USB_DT_CONFIG ) { - i += dev->descr[i]; -continue ; +if (dev->descr[i]<2 ) { +fprintf (stderr,"husb: invalid descriptor\n" ); + goto fail; } - config_descr_len = dev->descr[i]; +if (dev->descr[i+1 ] ==USB_DT_CONFIG ) { + config_descr_total_len = dev->descr[i+2 ] + (dev->descr[i+3 ]<<8 ); -printf ("husb: config #%d need %d\n" , dev->descr[i +5 ], configuration); +printf ("husb: config #%d need %d\n" , dev->descr[i +5 ], configuration); -if (configuration<0 || configuration == dev->descr[i +5 ]) { - configuration = dev->descr[i +5 ]; -break ; - } +if (configuration<0 || configuration == dev->descr[i +5 ]) { + configuration = dev->descr[i +5 ]; +break ; + } - i += config_descr_len; + i += config_descr_total_len; + } +else + i += dev->descr[i]; }if (i>= dev->descr_len) {
Quoted 6 lines · Anthony Liguori
Quoted 4 lines · TJ
Doesn't look like this has ever been committed. qemu-kvm-0.13 has just arrived to the portage tree, but I am still having problems with it. I checked the git log and it's not there! Please commit.
Quoted 8 lines
One off device hacks are concerning because it's basically impossible to review.
Why does this work on bare metal?
Regards,
Anthony Liguori
Probably because bare metal USB 2.0 controllers don't give a damn about USB 3 spec. :)
My guess is that they ignore the device descriptor length and assume that it's always equal 18. Although the USB 2.0 spec doesn't explicitly say anywhere that it can't be more than 18. IIRC USB 3 even adds some extensions to the device descriptor. And since I wanted my code to be portable and USB 3 ready ;) I rely on the value in dev_descr_len.
BTW, this patch is more than just a hack for the device in question. Without this patch qemu simply locks up when I attach the remote and spins in endless loop, because USB parsing is so very primitive. With this patch, USB parsing is done more intelligently and devices with whacky USB descriptors are simply rejected.
The hack part is really just 3 lines:
Quoted 3 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+ if (dev_descr_len == 0x18 && dev->descr[ 8] == 0x47 && dev->descr[ 9] == 0x46 + && dev->descr[10] == 0x00 && dev->descr[11] == 0x30) + dev_descr_len = USB_DT_DEVICE_LEN; /* for buggy MX-950 remote reporting len in hex */
And it is very harmless, as all it does is overwrites the device descriptor length with correct one.
If you don't like the hack, you can just remove the 3 lines above and use the rest of the patch. I will just have to remember to manually patch mine every time I upgrade.
Your thoughts?
-TJ
Quoted 39 lines · TJ
Quoted 7 lines · Anthony Liguori
Quoted 5 lines · TJ
Doesn't look like this has ever been committed. qemu-kvm-0.13 has just arrived to the portage tree, but I am still having problems with it. I checked the git log and it's not there! Please commit.
Quoted 9 lines
One off device hacks are concerning because it's basically impossible to review.
Why does this work on bare metal?
Regards,
Anthony Liguori
Probably because bare metal USB 2.0 controllers don't give a damn about USB 3 spec. :)
My guess is that they ignore the device descriptor length and assume that it's always equal 18. Although the USB 2.0 spec doesn't explicitly say anywhere that it can't be more than 18. IIRC USB 3 even adds some extensions to the device descriptor. And since I wanted my code to be portable and USB 3 ready ;) I rely on the value in
dev_descr_len.BTW, this patch is more than just a hack for the device in question. Without this patch qemu simply locks up when I attach the remote and spins in endless loop, because USB parsing is so very primitive. With this patch, USB parsing is done more intelligently and devices with whacky USB descriptors are simply rejected.
The hack part is really just 3 lines:
Quoted 4 lines
Review
Quoted 4 lines
(quoted diff) +3
-0+ if (dev_descr_len == 0x18&& dev->descr[ 8] == 0x47&& dev->descr[ 9] == 0x46 +&& dev->descr[10] == 0x00&& dev->descr[11] == 0x30) + dev_descr_len = USB_DT_DEVICE_LEN; /* for buggy MX-950 remote reporting len in hex */
Quoted 9 lines
And it is very harmless, as all it does is overwrites the device descriptor length with correct one.
If you don't like the hack, you can just remove the 3 lines above and use the rest of the patch. I will just have to remember to manually patch mine every time I upgrade.
Your thoughts?
Yeah, that bit is a bit too gnarly for my tastes, but if you can resend the rest of it with a Signed-off-by, I'd appreciate.
Regards,
Anthony Liguori
Quoted 2 lines
-TJ
Quoted 8 lines · Anthony Liguori
Quoted 7 lines
If you don't like the hack, you can just remove the 3 lines above and use the rest of the patch. I will just have to remember to manually patch mine every time I upgrade.
Your thoughts?
Quoted 10 lines
Yeah, that bit is a bit too gnarly for my tastes, but if you can resend the rest of it with a Signed-off-by, I'd appreciate.
Regards,
Anthony Liguori
Quoted 2 lines
-TJ
Antonio,
Did anything come of this? I resubmitted the patch without the hack, but it don't look like it was committed:
http://lists.nongnu.org/archive/html/qemu-devel/2010-11/msg01496.html
Ciao,
TJ