SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usb: allow max 8192 bytes for desc

Browse Source 
A device of USB video class usually uses larger desc structure, so
use larger buffer to avoid failure. (dev-video.c is ready)

This is an unlikely code path:
1, during guest startup, guest tries to probe device.
2, run 'lsusb' command in guest(or other similar commands).

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20220112015835.900619-1-pizhenwei@bytedance.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
zhenwei pi 2022-01-12 09:58:35 +08:00 committed by Gerd Hoffmann
parent 5280117b1e
commit 7cd2cfa2e6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/usb/desc.c
View File

@ -632,7 +632,8 @@ int usb_desc_get_descriptor(USBDevice *dev, USBPacket *p,
bool msos = (dev->flags & (1 << USB_DEV_FLAG_MSOS_DESC_IN_USE)); bool msos = (dev->flags & (1 << USB_DEV_FLAG_MSOS_DESC_IN_USE));
const USBDesc *desc = usb_device_get_usb_desc(dev); const USBDesc *desc = usb_device_get_usb_desc(dev);
const USBDescDevice *other_dev; const USBDescDevice *other_dev;
uint8_t buf[256]; size_t buflen = USB_DESC_MAX_LEN;
g_autofree uint8_t *buf = g_malloc(buflen);
uint8_t type = value >> 8; uint8_t type = value >> 8;
uint8_t index = value & 0xff; uint8_t index = value & 0xff;
int flags, ret = -1; int flags, ret = -1;
@ -650,36 +651,36 @@ int usb_desc_get_descriptor(USBDevice *dev, USBPacket *p,
switch(type) { switch(type) {
case USB_DT_DEVICE: case USB_DT_DEVICE:
ret = usb_desc_device(&desc->id, dev->device, msos, buf, sizeof(buf)); ret = usb_desc_device(&desc->id, dev->device, msos, buf, buflen);
trace_usb_desc_device(dev->addr, len, ret); trace_usb_desc_device(dev->addr, len, ret);
break; break;
case USB_DT_CONFIG: case USB_DT_CONFIG:
if (index < dev->device->bNumConfigurations) { if (index < dev->device->bNumConfigurations) {
ret = usb_desc_config(dev->device->confs + index, flags, ret = usb_desc_config(dev->device->confs + index, flags,
buf, sizeof(buf)); buf, buflen);
} }
trace_usb_desc_config(dev->addr, index, len, ret); trace_usb_desc_config(dev->addr, index, len, ret);
break; break;
case USB_DT_STRING: case USB_DT_STRING:
ret = usb_desc_string(dev, index, buf, sizeof(buf)); ret = usb_desc_string(dev, index, buf, buflen);
trace_usb_desc_string(dev->addr, index, len, ret); trace_usb_desc_string(dev->addr, index, len, ret);
break; break;
case USB_DT_DEVICE_QUALIFIER: case USB_DT_DEVICE_QUALIFIER:
if (other_dev != NULL) { if (other_dev != NULL) {
ret = usb_desc_device_qualifier(other_dev, buf, sizeof(buf)); ret = usb_desc_device_qualifier(other_dev, buf, buflen);
} }
trace_usb_desc_device_qualifier(dev->addr, len, ret); trace_usb_desc_device_qualifier(dev->addr, len, ret);
break; break;
case USB_DT_OTHER_SPEED_CONFIG: case USB_DT_OTHER_SPEED_CONFIG:
if (other_dev != NULL && index < other_dev->bNumConfigurations) { if (other_dev != NULL && index < other_dev->bNumConfigurations) {
ret = usb_desc_config(other_dev->confs + index, flags, ret = usb_desc_config(other_dev->confs + index, flags,
buf, sizeof(buf)); buf, buflen);
buf[0x01] = USB_DT_OTHER_SPEED_CONFIG; buf[0x01] = USB_DT_OTHER_SPEED_CONFIG;
} }
trace_usb_desc_other_speed_config(dev->addr, index, len, ret); trace_usb_desc_other_speed_config(dev->addr, index, len, ret);
break; break;
case USB_DT_BOS: case USB_DT_BOS:
ret = usb_desc_bos(desc, buf, sizeof(buf)); ret = usb_desc_bos(desc, buf, buflen);
trace_usb_desc_bos(dev->addr, len, ret); trace_usb_desc_bos(dev->addr, len, ret);
break; break;

1
hw/usb/desc.h
View File

@ -199,6 +199,7 @@ struct USBDesc {
const USBDescMSOS *msos; const USBDescMSOS *msos;
}; };
#define USB_DESC_MAX_LEN 8192
#define USB_DESC_FLAG_SUPER (1 << 1) #define USB_DESC_FLAG_SUPER (1 << 1)
/* little helpers */ /* little helpers */