jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Check index bounds on usb string descriptor request.

Browse Source
This commit is contained in:
Gareth McMullin 2011-04-24 14:28:16 +12:00
parent cd88855d13
commit 7434d50fda
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/usb/usb_standard.c
View File

@ -98,6 +98,11 @@ static int usb_standard_get_descriptor(struct usb_setup_data *req,
if (!_usbd_device.strings) if (!_usbd_device.strings)
return 0; /* Device doesn't support strings. */ return 0; /* Device doesn't support strings. */
/* Check that string index is in range */
for(i = 0; i <= (req->wValue & 0xff); i++)
if(_usbd_device.strings[i] == NULL)
return 0;
sd->bLength = strlen(_usbd_device.strings[req->wValue & 0xff]) sd->bLength = strlen(_usbd_device.strings[req->wValue & 0xff])
* 2 + 2; * 2 + 2;
sd->bDescriptorType = USB_DT_STRING; sd->bDescriptorType = USB_DT_STRING;