diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-13 08:47:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-14 05:07:30 -0400 |
commit | b0addd3fa6bcd119be9428996d5d4522479ab240 (patch) | |
tree | 3768e9d858743a26feb196a4ae06a16b9a1f8cdc | |
parent | 4495c08e84729385774601b5146d51d9e5849f81 (diff) |
USB: idmouse: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/misc/idmouse.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index 8b9fd7534f69..502bfe30a077 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
@@ -347,6 +347,9 @@ static int idmouse_probe(struct usb_interface *interface, | |||
347 | if (iface_desc->desc.bInterfaceClass != 0x0A) | 347 | if (iface_desc->desc.bInterfaceClass != 0x0A) |
348 | return -ENODEV; | 348 | return -ENODEV; |
349 | 349 | ||
350 | if (iface_desc->desc.bNumEndpoints < 1) | ||
351 | return -ENODEV; | ||
352 | |||
350 | /* allocate memory for our device state and initialize it */ | 353 | /* allocate memory for our device state and initialize it */ |
351 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 354 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
352 | if (dev == NULL) | 355 | if (dev == NULL) |