UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:  syzbot+6102c120be558c885f04@syzkaller.appspotmail.com
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Oliver Neukum 2019-09-19 10:23:08 +02:00 committed by David S. Miller
parent b41dae061b
commit 280ceaed79
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/usb/usbnet.c
View File

@ -339,6 +339,8 @@ void usbnet_update_max_qlen(struct usbnet *dev)
{ {
enum usb_device_speed speed = dev->udev->speed; enum usb_device_speed speed = dev->udev->speed;
if (!dev->rx_urb_size || !dev->hard_mtu)
goto insanity;
switch (speed) { switch (speed) {
case USB_SPEED_HIGH: case USB_SPEED_HIGH:
dev->rx_qlen = MAX_QUEUE_MEMORY / dev->rx_urb_size; 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; dev->tx_qlen = 5 * MAX_QUEUE_MEMORY / dev->hard_mtu;
break; break;
default: default:
insanity:
dev->rx_qlen = dev->tx_qlen = 4; dev->rx_qlen = dev->tx_qlen = 4;
} }
} }