summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2017-09-18 06:40:40 -0700
committerMarek Vasut <marex@denx.de>2017-10-01 16:32:53 +0200
commit2f0eb2ac4b84f94e2f7de6e4ec9b63ce07cfec7a (patch)
tree8a4d96e9b04696019b845148920e3a90b0741369
parent8a0e6d83070a977442aaba2c5a74cbe34e157012 (diff)
usb: Handle audio extension endpoint descriptor in usb_parse_config()
Normal endpoint descriptor size is 7, but for audio extension it is 9. Handle that correctly when parsing endpoint descriptor. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--common/usb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/usb.c b/common/usb.c
index 0904259757..6cb92ef4f5 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -437,12 +437,13 @@ static int usb_parse_config(struct usb_device *dev,
}
break;
case USB_DT_ENDPOINT:
- if (head->bLength != USB_DT_ENDPOINT_SIZE) {
+ if (head->bLength != USB_DT_ENDPOINT_SIZE &&
+ head->bLength != USB_DT_ENDPOINT_AUDIO_SIZE) {
printf("ERROR: Invalid USB EP length (%d)\n",
head->bLength);
break;
}
- if (index + USB_DT_ENDPOINT_SIZE >
+ if (index + head->bLength >
dev->config.desc.wTotalLength) {
puts("USB EP descriptor overflowed buffer!\n");
break;