| Message ID | 20200114082729.24063-1-johan@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 86f3f4cd53707ceeec079b83205c8d3c756eca93 |
| Headers | show |
| Series | r8152: add missing endpoint sanity check | expand |
From: Johan Hovold <johan@kernel.org> Date: Tue, 14 Jan 2020 09:27:29 +0100 > Add missing endpoint sanity check to probe in order to prevent a > NULL-pointer dereference (or slab out-of-bounds access) when retrieving > the interrupt-endpoint bInterval on ndo_open() in case a device lacks > the expected endpoints. > > Fixes: 40a82917b1d3 ("net/usb/r8152: enable interrupt transfer") > Cc: hayeswang <hayeswang@realtek.com> > Signed-off-by: Johan Hovold <johan@kernel.org> Applied and queued up for -stable, thank you.
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index c5ebf35d2488..031cb8fff909 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -6597,6 +6597,9 @@ static int rtl8152_probe(struct usb_interface *intf, return -ENODEV; } + if (intf->cur_altsetting->desc.bNumEndpoints < 3) + return -ENODEV; + usb_reset_device(udev); netdev = alloc_etherdev(sizeof(struct r8152)); if (!netdev) {
Add missing endpoint sanity check to probe in order to prevent a NULL-pointer dereference (or slab out-of-bounds access) when retrieving the interrupt-endpoint bInterval on ndo_open() in case a device lacks the expected endpoints. Fixes: 40a82917b1d3 ("net/usb/r8152: enable interrupt transfer") Cc: hayeswang <hayeswang@realtek.com> Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/net/usb/r8152.c | 3 +++ 1 file changed, 3 insertions(+)