[PATCH] watchdog: pcwd_usb: fix NULL-deref at probe

From	Johan Hovold <johan@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH] watchdog: pcwd_usb: fix NULL-deref at probe
Date	2017-03-13 14:00 +0100
Message-ID	<tkxJU-Fd-25@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 drivers/watchdog/pcwd_usb.c | 3 +++
 1 file changed, 3 insertions(+)

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;
 
-- 
2.12.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] watchdog: pcwd_usb: fix NULL-deref at probe Johan Hovold <johan@kernel.org> - 2017-03-13 14:00 +0100
  Re: [PATCH] watchdog: pcwd_usb: fix NULL-deref at probe Guenter Roeck <linux@roeck-us.net> - 2017-03-13 14:50 +0100
    Re: [PATCH] watchdog: pcwd_usb: fix NULL-deref at probe Johan Hovold <johan@kernel.org> - 2017-03-13 15:20 +0100
      Re: [PATCH] watchdog: pcwd_usb: fix NULL-deref at probe Guenter Roeck <linux@roeck-us.net> - 2017-03-13 18:20 +0100
  Re: [PATCH] watchdog: pcwd_usb: fix NULL-deref at probe Guenter Roeck <linux@roeck-us.net> - 2017-03-13 18:20 +0100

csiph-web