Skip to contentSkip to conversation

net: wimax/i2400m: fix NULL-deref at probe

PATCH In review Johan Hovold 2 participants 2 messages Mar 13, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <[email protected]>

---
 drivers/net/wimax/i2400m/usb.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wimax/i2400m/usb.c +3 -0
index e7f5910a6519..f8eb66ef2944 100644
@@ -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");
 
Signature · 1 line
2.12.0
maintainer
#1 lore raw

From: Johan Hovold <[email protected]>
Date: Mon, 13 Mar 2017 13:42:03 +0100

Quoted 4 lines

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.

Quoted 8 lines

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-VuQAYsv1563Yd54FQh9/[email protected]>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html