diff options
| author | Johan Hovold <johan@kernel.org> | 2017-03-13 13:42:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-13 12:28:40 -0700 |
| commit | 6e526fdff7be4f13b24f929a04c0e9ae6761291e (patch) | |
| tree | 5c1adb8fb7580b551628871a0d08b32b16ad613c | |
| parent | 68c32f9c2a36d410aa242e661506e5b2c2764179 (diff) | |
| download | talos-obmc-linux-6e526fdff7be4f13b24f929a04c0e9ae6761291e.tar.gz talos-obmc-linux-6e526fdff7be4f13b24f929a04c0e9ae6761291e.zip | |
net: wimax/i2400m: fix NULL-deref at probe
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.
The endpoints are specifically dereferenced in the i2400m_bootrom_init
path during probe (e.g. in i2400mu_tx_bulk_out).
Fixes: f398e4240fce ("i2400m/USB: probe/disconnect, dev init/shutdown
and reset backends")
Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/wimax/i2400m/usb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c index e7f5910a6519..f8eb66ef2944 100644 --- a/drivers/net/wimax/i2400m/usb.c +++ b/drivers/net/wimax/i2400m/usb.c @@ -467,6 +467,9 @@ int i2400mu_probe(struct usb_interface *iface, struct i2400mu *i2400mu; struct usb_device *usb_dev = interface_to_usbdev(iface); + if (iface->cur_altsetting->desc.bNumEndpoints < 4) + return -ENODEV; + if (usb_dev->speed != USB_SPEED_HIGH) dev_err(dev, "device not connected as high speed\n"); |
