diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-13 08:47:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-30 03:41:24 -0400 |
commit | a4887ea588e9bf515e43094bb09be21e13ee0908 (patch) | |
tree | 4c1049cc6269cc2c80f71cb90a5ee39a2fc9a343 /drivers/usb | |
parent | 21e0621e3cd7d046715c1cbcbe70ecd34ddd5208 (diff) |
USB: idmouse: fix NULL-deref at probe
commit b0addd3fa6bcd119be9428996d5d4522479ab240 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-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 2975e80b7a56..9a67ae39185b 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
@@ -346,6 +346,9 @@ static int idmouse_probe(struct usb_interface *interface, | |||
346 | if (iface_desc->desc.bInterfaceClass != 0x0A) | 346 | if (iface_desc->desc.bInterfaceClass != 0x0A) |
347 | return -ENODEV; | 347 | return -ENODEV; |
348 | 348 | ||
349 | if (iface_desc->desc.bNumEndpoints < 1) | ||
350 | return -ENODEV; | ||
351 | |||
349 | /* allocate memory for our device state and initialize it */ | 352 | /* allocate memory for our device state and initialize it */ |
350 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 353 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
351 | if (dev == NULL) | 354 | if (dev == NULL) |