diff options
| author | Szymon Heidrich <szymon.heidrich@gmail.com> | 2022-01-24 14:14:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-16 14:56:35 +0300 |
| commit | 3e33e5c67cb9ebd2b791b9a9fb2b71daacebd8d4 (patch) | |
| tree | 3b45c5814f0d1cac6bbbc017d1ffc6b1347c7d10 /drivers/usb | |
| parent | d3d5bfb3a279eaa4f344cb7554b0603641a4ae34 (diff) | |
| download | linux-3e33e5c67cb9ebd2b791b9a9fb2b71daacebd8d4.tar.xz | |
USB: gadget: validate interface OS descriptor requests
commit 75e5b4849b81e19e9efe1654b30d7f3151c33c2c upstream.
Stall the control endpoint in case provided index exceeds array size of
MAX_CONFIG_INTERFACES or when the retrieved function pointer is null.
Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 3789c329183c..553382ce3837 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1975,6 +1975,9 @@ unknown: 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); |