diff options
| author | Johan Hovold <johan@kernel.org> | 2017-03-13 15:49:45 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-09-15 20:30:45 +0300 |
| commit | 95bb1ba02a18f10f8ac61b72b56a0782f39f6f91 (patch) | |
| tree | fe3c5841ce27e57f4bb02ea7e36cfa5092c95e19 /drivers | |
| parent | a64f41f9bf410e24fe687116ba251b5c5d243830 (diff) | |
| download | linux-95bb1ba02a18f10f8ac61b72b56a0782f39f6f91.tar.xz | |
watchdog: pcwd_usb: fix NULL-deref at probe
commit 46c319b848268dab3f0e7c4a5b6e9146d3bca8a4 upstream.
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/pcwd_usb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c index 748a74bd85e7..7da3298a119f 100644 --- a/drivers/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c @@ -641,6 +641,9 @@ static int usb_pcwd_probe(struct usb_interface *interface, return -ENODEV; } + if (iface_desc->desc.bNumEndpoints < 1) + return -ENODEV; + /* check out the endpoint: it has to be Interrupt & IN */ endpoint = &iface_desc->endpoint[0].desc; |