commit 5d2e2c296f1b6c9059af7f986f1326195b2c3301
author Szymon Heidrich <szymon.heidrich@gmail.com> Mon Jan 24 12:14:00 2022 +0100
committer Karsten Tausche <karsten@fairphone.com> Thu Jun 02 10:11:48 2022 +0200
tree 851dc27fdb5d2babe5757dae902f0cb100f6f6a0
parent 5a08838922e72111a576d06c00110445f910b35f

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.

Issue: FP3SEC-355
Issue: FP3SEC-404
Bug: 213172319
Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 75e5b4849b81e19e9efe1654b30d7f3151c33c2c)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I78f46b6f2140394a6bc6cff9f829c0742d7ad2fc
(cherry picked from commit c7732dbce590ef33ac2345f21efa6703f78b9e95)
(cherry picked from commit 823fc2b264f1ec12678564271c5fa34e3250cf83)

drivers/usb/gadget/composite.c

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 7f3cc5c..8e6d973 100755
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -2053,6 +2053,9 @@
 				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;
 				if (w_length == 0x0A) {
 					count = count_ext_prop(os_desc_cfg,