ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: host-linux: Ignore parsing errors of the device descriptors 

The Linux is more tolerant here as well: Just stop parsing the device
descriptors when an error is detected but do not reset what was found
so far. This allows to run buggy devices with partially invalid
descriptors.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Jan Kiszka 2012-11-15 09:23:30 +01:00 committed by Gerd Hoffmann
parent c06c68c928
commit 537e8f1aa8
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/usb/host-linux.c
View File

@ -135,7 +135,7 @@ static int parse_filter(const char *spec, struct USBAutoFilter *f);
static void usb_host_auto_check(void *unused); static void usb_host_auto_check(void *unused);
static int usb_host_read_file(char *line, size_t line_size, static int usb_host_read_file(char *line, size_t line_size,
const char *device_file, const char *device_name); const char *device_file, const char *device_name);
static int usb_linux_update_endp_table(USBHostDevice *s); static void usb_linux_update_endp_table(USBHostDevice *s);
static int usb_host_usbfs_type(USBHostDevice *s, USBPacket *p) static int usb_host_usbfs_type(USBHostDevice *s, USBPacket *p)
{ {
@ -1132,8 +1132,7 @@ static void usb_host_handle_control(USBDevice *dev, USBPacket *p,
p->status = USB_RET_ASYNC; p->status = USB_RET_ASYNC;
} }
/* returns 1 on problem encountered or 0 for success */ static void usb_linux_update_endp_table(USBHostDevice *s)
static int usb_linux_update_endp_table(USBHostDevice *s)
{ {
static const char *tname[] = { static const char *tname[] = {
[USB_ENDPOINT_XFER_CONTROL] = "control", [USB_ENDPOINT_XFER_CONTROL] = "control",
@ -1159,23 +1158,23 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
if (d->bLength < 2) { if (d->bLength < 2) {
trace_usb_host_parse_error(s->bus_num, s->addr, trace_usb_host_parse_error(s->bus_num, s->addr,
"descriptor too short"); "descriptor too short");
goto error; return;
} }
if (i + d->bLength > s->descr_len) { if (i + d->bLength > s->descr_len) {
trace_usb_host_parse_error(s->bus_num, s->addr, trace_usb_host_parse_error(s->bus_num, s->addr,
"descriptor too long"); "descriptor too long");
goto error; return;
} }
switch (d->bDescriptorType) { switch (d->bDescriptorType) {
case 0: case 0:
trace_usb_host_parse_error(s->bus_num, s->addr, trace_usb_host_parse_error(s->bus_num, s->addr,
"invalid descriptor type"); "invalid descriptor type");
goto error; return;
case USB_DT_DEVICE: case USB_DT_DEVICE:
if (d->bLength < 0x12) { if (d->bLength < 0x12) {
trace_usb_host_parse_error(s->bus_num, s->addr, trace_usb_host_parse_error(s->bus_num, s->addr,
"device descriptor too short"); "device descriptor too short");
goto error; return;
} }
v = (d->u.device.idVendor_hi << 8) | d->u.device.idVendor_lo; v = (d->u.device.idVendor_hi << 8) | d->u.device.idVendor_lo;
p = (d->u.device.idProduct_hi << 8) | d->u.device.idProduct_lo; p = (d->u.device.idProduct_hi << 8) | d->u.device.idProduct_lo;
@ -1185,7 +1184,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
if (d->bLength < 0x09) { if (d->bLength < 0x09) {
trace_usb_host_parse_error(s->bus_num, s->addr, trace_usb_host_parse_error(s->bus_num, s->addr,
"config descriptor too short"); "config descriptor too short");
goto error; return;
} }
configuration = d->u.config.bConfigurationValue; configuration = d->u.config.bConfigurationValue;
active = (configuration == s->dev.configuration); active = (configuration == s->dev.configuration);
@ -1196,7 +1195,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
if (d->bLength < 0x09) { if (d->bLength < 0x09) {
trace_usb_host_parse_error(s->bus_num, s->addr, trace_usb_host_parse_error(s->bus_num, s->addr,
"interface descriptor too short"); "interface descriptor too short");
goto error; return;
} }
interface = d->u.interface.bInterfaceNumber; interface = d->u.interface.bInterfaceNumber;
altsetting = d->u.interface.bAlternateSetting; altsetting = d->u.interface.bAlternateSetting;
@ -1209,7 +1208,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
if (d->bLength < 0x07) { if (d->bLength < 0x07) {
trace_usb_host_parse_error(s->bus_num, s->addr, trace_usb_host_parse_error(s->bus_num, s->addr,
"endpoint descriptor too short"); "endpoint descriptor too short");
goto error; return;
} }
devep = d->u.endpoint.bEndpointAddress; devep = d->u.endpoint.bEndpointAddress;
pid = (devep & USB_DIR_IN) ? USB_TOKEN_IN : USB_TOKEN_OUT; pid = (devep & USB_DIR_IN) ? USB_TOKEN_IN : USB_TOKEN_OUT;
@ -1217,7 +1216,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
if (ep == 0) { if (ep == 0) {
trace_usb_host_parse_error(s->bus_num, s->addr, trace_usb_host_parse_error(s->bus_num, s->addr,
"invalid endpoint address"); "invalid endpoint address");
goto error; return;
} }
type = d->u.endpoint.bmAttributes & 0x3; type = d->u.endpoint.bmAttributes & 0x3;
@ -1250,11 +1249,6 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
break; break;
} }
} }
return 0;
error:
usb_ep_reset(&s->dev);
return 1;
} }
/* /*
@ -1341,10 +1335,7 @@ static int usb_host_open(USBHostDevice *dev, int bus_num,
} }
usb_ep_init(&dev->dev); usb_ep_init(&dev->dev);
ret = usb_linux_update_endp_table(dev); usb_linux_update_endp_table(dev);
if (ret) {
goto fail;
}
if (speed == -1) { if (speed == -1) {
struct usbdevfs_connectinfo ci; struct usbdevfs_connectinfo ci;