diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-13 08:49:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-25 09:44:30 -0400 |
commit | 7a2b8471ab1243437215468b4da6c5ddfd4d80da (patch) | |
tree | e31aac8a7a57a57871f1f0c2caf94d177e04a454 | |
parent | 6e2078c100929be9e21229c6c6732bd8ff0d88c2 (diff) |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 99ebf6ea3de6..5615f4013924 100644 --- a/drivers/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c | |||
@@ -630,6 +630,9 @@ static int usb_pcwd_probe(struct usb_interface *interface, | |||
630 | return -ENODEV; | 630 | return -ENODEV; |
631 | } | 631 | } |
632 | 632 | ||
633 | if (iface_desc->desc.bNumEndpoints < 1) | ||
634 | return -ENODEV; | ||
635 | |||
633 | /* check out the endpoint: it has to be Interrupt & IN */ | 636 | /* check out the endpoint: it has to be Interrupt & IN */ |
634 | endpoint = &iface_desc->endpoint[0].desc; | 637 | endpoint = &iface_desc->endpoint[0].desc; |
635 | 638 | ||