Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14d60447 authored by Szymon Heidrich's avatar Szymon Heidrich Committed by PavanKumar S.R
Browse files

UPSTREAM: USB: gadget: validate interface OS descriptor requests 



Stall the control endpoint in case provided index exceeds array size of
MAX_CONFIG_INTERFACES or when the retrieved function pointer is null.

Bug: 213172319
Signed-off-by: default avatarSzymon Heidrich <szymon.heidrich@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 75e5b4849b81e19e9efe1654b30d7f3151c33c2c)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I78f46b6f2140394a6bc6cff9f829c0742d7ad2fc
(cherry picked from commit c7732dbce590ef33ac2345f21efa6703f78b9e95)
Git-commit: 823fc2b264f1ec12678564271c5fa34e3250cf83
Git-repo: https://android.googlesource.com/kernel/common


Signed-off-by: default avatarPavanKumar S.R <quic_pavasr@quicinc.com>
parent 5052ea7c

drivers/usb/gadget/composite.c

+3 −0
Original line number Diff line number Diff line
@@ -2062,6 +2062,9 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
				if (w_index != 0x5 || (w_value >> 8))

					break;

				interface = w_value & 0xFF;

				if (interface >= MAX_CONFIG_INTERFACES ||

				    !os_desc_cfg->interface[interface])

					break;

				buf[6] = w_index;

				count = count_ext_prop(os_desc_cfg,

					interface);