Skip to contentSkip to conversation

usbnet: sanity checking of packet sizes and device mtu

PATCH In review Oliver Neukum 2 participants 2 messages Sep 19, 2019

Subsystems (4)
lore
Share & tools
lore

Oliver Neukum

author maintainer
#0 lore raw

PATCH 1/1 usbnet: sanity checking of packet sizes and device mtu

After a reset packet sizes and device mtu can change and need to be reevaluated to calculate queue sizes. Malicious devices can set this to zero and we divide by it. Introduce sanity checking.

Reported-and-tested-by [email protected]
---
 drivers/net/usb/usbnet.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/usb/usbnet.c +3 -0
index 58952a79b05f..e44849499b89 100644
@@ -339,6 +339,8 @@ void usbnet_update_max_qlen(struct usbnet *dev)
 {
 	enum usb_device_speed speed = dev->udev->speed;
 
+	if (!dev->rx_urb_size || !dev->hard_mtu)
+		goto insanity;
 	switch (speed) {
 	case USB_SPEED_HIGH:
 		dev->rx_qlen = MAX_QUEUE_MEMORY / dev->rx_urb_size;
@@ -355,6 +357,7 @@ void usbnet_update_max_qlen(struct usbnet *dev)
 		dev->tx_qlen = 5 * MAX_QUEUE_MEMORY / dev->hard_mtu;
 		break;
 	default:
+insanity:
 		dev->rx_qlen = dev->tx_qlen = 4;
 	}
 }
Signature · 1 line
2.16.4
maintainer
#1 lore raw

From: Oliver Neukum <[email protected]>
Date: Thu, 19 Sep 2019 10:23:08 +0200

Quoted 7 lines

After a reset packet sizes and device mtu can change and need to be reevaluated to calculate queue sizes. Malicious devices can set this to zero and we divide by it. Introduce sanity checking.

Reported-and-tested-by [email protected]

Applied and queued up for -stable.