Message ID | 20190820092826.17694-1-oneukum@suse.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | de7b9aa633b693e77942e12f1769506efae6917b |
Headers | show |
Series | usbtmc: more sanity checking for packet size | expand |
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 4942122b2346..36858ddd8d9b 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -2362,8 +2362,11 @@ static int usbtmc_probe(struct usb_interface *intf, goto err_put; } + retcode = -EINVAL; data->bulk_in = bulk_in->bEndpointAddress; data->wMaxPacketSize = usb_endpoint_maxp(bulk_in); + if (!data->wMaxPacketSize) + goto err_put; dev_dbg(&intf->dev, "Found bulk in endpoint at %u\n", data->bulk_in); data->bulk_out = bulk_out->bEndpointAddress;
A malicious device can make the driver divide ny zero with a nonsense maximum packet size. V2: return a sensible error code SIgned-off-by: Oliver Neukum <oneukum@suse.com> --- drivers/usb/class/usbtmc.c | 3 +++ 1 file changed, 3 insertions(+)