ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Scan all descriptors when checking for fastboot"

Browse source
This commit is contained in:
Patrick Tjin 2014-07-17 03:52:19 +00:00 • committed by Gerrit Code Review
commit 5328f671b5
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
fastboot/usb_linux.c
View file

@ -100,12 +100,12 @@ static inline int badname(const char *name)
static int check(void *_desc, int len, unsigned type, int size) static int check(void *_desc, int len, unsigned type, int size)
{ {
unsigned char *desc = _desc; struct usb_descriptor_header *hdr = (struct usb_descriptor_header *)_desc;
if(len < size) return -1; if(len < size) return -1;
if(desc[0] < size) return -1; if(hdr->bLength < size) return -1;
if(desc[0] > len) return -1; if(hdr->bLength > len) return -1;
if(desc[1] != type) return -1; if(hdr->bDescriptorType != type) return -1;
return 0; return 0;
} }
@ -125,15 +125,15 @@ static int filter_usb_device(char* sysfs_name,
unsigned i; unsigned i;
unsigned e; unsigned e;
if(check(ptr, len, USB_DT_DEVICE, USB_DT_DEVICE_SIZE)) if (check(ptr, len, USB_DT_DEVICE, USB_DT_DEVICE_SIZE))
return -1; return -1;
dev = (void*) ptr; dev = (struct usb_device_descriptor *)ptr;
len -= dev->bLength; len -= dev->bLength;
ptr += dev->bLength; ptr += dev->bLength;
if(check(ptr, len, USB_DT_CONFIG, USB_DT_CONFIG_SIZE)) if (check(ptr, len, USB_DT_CONFIG, USB_DT_CONFIG_SIZE))
return -1; return -1;
cfg = (void*) ptr; cfg = (struct usb_config_descriptor *)ptr;
len -= cfg->bLength; len -= cfg->bLength;
ptr += cfg->bLength; ptr += cfg->bLength;
@ -177,9 +177,19 @@ static int filter_usb_device(char* sysfs_name,
} }
for(i = 0; i < cfg->bNumInterfaces; i++) { for(i = 0; i < cfg->bNumInterfaces; i++) {
if(check(ptr, len, USB_DT_INTERFACE, USB_DT_INTERFACE_SIZE))
while (len > 0) {
struct usb_descriptor_header *hdr = (struct usb_descriptor_header *)ptr;
if (check(hdr, len, USB_DT_INTERFACE, USB_DT_INTERFACE_SIZE) == 0)
break;
len -= hdr->bLength;
ptr += hdr->bLength;
}
if (len <= 0)
return -1; return -1;
ifc = (void*) ptr;
ifc = (struct usb_interface_descriptor *)ptr;
len -= ifc->bLength; len -= ifc->bLength;
ptr += ifc->bLength; ptr += ifc->bLength;
@ -190,16 +200,25 @@ static int filter_usb_device(char* sysfs_name,
info.ifc_protocol = ifc->bInterfaceProtocol; info.ifc_protocol = ifc->bInterfaceProtocol;
for(e = 0; e < ifc->bNumEndpoints; e++) { for(e = 0; e < ifc->bNumEndpoints; e++) {
if(check(ptr, len, USB_DT_ENDPOINT, USB_DT_ENDPOINT_SIZE)) while (len > 0) {
return -1; struct usb_descriptor_header *hdr = (struct usb_descriptor_header *)ptr;
ept = (void*) ptr; if (check(hdr, len, USB_DT_ENDPOINT, USB_DT_ENDPOINT_SIZE) == 0)
break;
len -= hdr->bLength;
ptr += hdr->bLength;
}
if (len < 0) {
break;
}
ept = (struct usb_endpoint_descriptor *)ptr;
len -= ept->bLength; len -= ept->bLength;
ptr += ept->bLength; ptr += ept->bLength;
if((ept->bmAttributes & 0x03) != 0x02) if((ept->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_BULK)
continue; continue;
if(ept->bEndpointAddress & 0x80) { if(ept->bEndpointAddress & USB_ENDPOINT_DIR_MASK) {
in = ept->bEndpointAddress; in = ept->bEndpointAddress;
} else { } else {
out = ept->bEndpointAddress; out = ept->bEndpointAddress;