diff options
| author | riastradh <riastradh@NetBSD.org> | 2022-04-17 13:17:40 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2022-04-17 13:17:40 +0000 |
| commit | 268a72f8f4fc006c0fbe0ca7e6828f4044d1df4f (patch) | |
| tree | 448488e7385e131b5eddcbbcccc46893bedd0865 /sys/dev/usb | |
| parent | a2b03bc4c5c6baa648ecfdfc6a81a06c6a5aa5d9 (diff) | |
umb(4): Validate descriptor lengths.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/if_umb.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c index faabf594f70..1fc48dcd4ac 100644 --- a/sys/dev/usb/if_umb.c +++ b/sys/dev/usb/if_umb.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_umb.c,v 1.22 2022/04/17 13:15:27 riastradh Exp $ */ +/* $NetBSD: if_umb.c,v 1.23 2022/04/17 13:17:40 riastradh Exp $ */ /* $OpenBSD: if_umb.c,v 1.20 2018/09/10 17:00:45 gerhard Exp $ */ /* @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.22 2022/04/17 13:15:27 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.23 2022/04/17 13:17:40 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -336,6 +336,8 @@ umb_attach(device_t parent, device_t self, void *aux) usb_desc_iter_init(sc->sc_udev, &iter); while ((desc = usb_desc_iter_next(&iter))) { if (desc->bDescriptorType == UDESC_INTERFACE_ASSOC) { + if (desc->bLength < sizeof(*ad)) + continue; ad = (const usb_interface_assoc_descriptor_t *)desc; if (ad->bFirstInterface == uiaa->uiaa_ifaceno && ad->bInterfaceCount > 1) @@ -343,6 +345,8 @@ umb_attach(device_t parent, device_t self, void *aux) continue; } if (desc->bDescriptorType == UDESC_INTERFACE) { + if (desc->bLength < sizeof(*id)) + continue; id = (const usb_interface_descriptor_t *)desc; current_ifaceno = id->bInterfaceNumber; continue; @@ -351,13 +355,19 @@ umb_attach(device_t parent, device_t self, void *aux) continue; if (desc->bDescriptorType != UDESC_CS_INTERFACE) continue; + if (desc->bLength < sizeof(*csdesc)) + continue; csdesc = (const usb_cdc_descriptor_t *)desc; switch (csdesc->bDescriptorSubtype) { case UDESCSUB_CDC_UNION: + if (desc->bLength < sizeof(*ud)) + continue; ud = (const usb_cdc_union_descriptor_t *)desc; data_ifaceno = ud->bSlaveInterface[0]; break; case UDESCSUB_MBIM: + if (desc->bLength < sizeof(*md)) + continue; md = (const struct mbim_descriptor *)desc; v = UGETW(md->bcdMBIMVersion); sc->sc_ver_maj = MBIM_VER_MAJOR(v); |
