diff options
| author | Johan Hovold <johan@kernel.org> | 2017-03-13 13:49:45 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2017-05-18 18:51:34 +0200 |
| commit | 46c319b848268dab3f0e7c4a5b6e9146d3bca8a4 (patch) | |
| tree | 3567d7523be2606c62ef1c2bc6ac141ef7ff4d7e /drivers/watchdog | |
| parent | watchdog: sama5d4: fix race condition (diff) | |
| download | linux-46c319b848268dab3f0e7c4a5b6e9146d3bca8a4.tar.xz linux-46c319b848268dab3f0e7c4a5b6e9146d3bca8a4.zip | |
watchdog: pcwd_usb: fix NULL-deref at probe
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")
Cc: stable <stable@vger.kernel.org>
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>
Diffstat (limited to 'drivers/watchdog')
| -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, 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; |