From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 29 Oct 2013 08:06:54 +0000 (+0100)
Subject: uas: Fix bounds check in uas_find_endpoints
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d495c1baa1b3ba277bb5ae24adeab0600151cba4;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

uas: Fix bounds check in uas_find_endpoints

The loop uses up to 3 bytes of the endpoint extra data.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
---

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 1ac66f290fbf..7662b3e13c4d 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -907,7 +907,7 @@ static int uas_find_endpoints(struct usb_host_interface *alt,
 	for (i = 0; i < n_endpoints; i++) {
 		unsigned char *extra = endpoint[i].extra;
 		int len = endpoint[i].extralen;
-		while (len > 1) {
+		while (len >= 3) {
 			if (extra[1] == USB_DT_PIPE_USAGE) {
 				unsigned pipe_id = extra[2];
 				if (pipe_id > 0 && pipe_id < 5)