diff options
| author |   Johan Hovold <johan@kernel.org> | 2020-07-28 14:10:29 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-07-28 13:35:44 -0700 |
| commit | 8d8e95fd6d69d774013f51e5f2ee10c6e6d1fc14 (patch) | |
| tree | 03ad8c7fe8f15ede76c671a0cfc1b26a4acce2f3 /drivers/net/usb/lan78xx.c | |
| parent | usb: hso: check for return value in hso_serial_common_create() (diff) | |
| download | linux-dev-8d8e95fd6d69d774013f51e5f2ee10c6e6d1fc14.tar.xz linux-dev-8d8e95fd6d69d774013f51e5f2ee10c6e6d1fc14.zip | |
net: lan78xx: add missing endpoint sanity check
Add the missing endpoint sanity check to prevent a NULL-pointer
dereference should a malicious device lack the expected endpoints.
Note that the driver has a broken endpoint-lookup helper,
lan78xx_get_endpoints(), which can end up accepting interfaces in an
altsetting without endpoints as long as *some* altsetting has a bulk-in
and a bulk-out endpoint.
Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
Cc: Woojung.Huh@microchip.com <Woojung.Huh@microchip.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/lan78xx.c')
| -rw-r--r-- | drivers/net/usb/lan78xx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index eccbf4cd7149..d7162690e3f3 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -3759,6 +3759,11 @@ static int lan78xx_probe(struct usb_interface *intf, netdev->max_mtu = MAX_SINGLE_PACKET_SIZE; netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER); + if (intf->cur_altsetting->desc.bNumEndpoints < 3) { + ret = -ENODEV; + goto out3; + } + dev->ep_blkin = (intf->cur_altsetting)->endpoint + 0; dev->ep_blkout = (intf->cur_altsetting)->endpoint + 1; dev->ep_intr = (intf->cur_altsetting)->endpoint + 2; |