Skip to content

Commit

Permalink
watchdog: pcwd_usb: fix NULL-deref at probe
Browse files Browse the repository at this point in the history
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.

Fixes: 1da177e ("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>
  • Loading branch information
Johan Hovold authored and Wim Van Sebroeck committed May 18, 2017
1 parent ddd6d24 commit 46c319b
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/watchdog/pcwd_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 46c319b

Please sign in to comment.