diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-13 12:47:48 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-30 07:41:24 (GMT) |
commit | a4887ea588e9bf515e43094bb09be21e13ee0908 (patch) | |
tree | 4c1049cc6269cc2c80f71cb90a5ee39a2fc9a343 /drivers | |
parent | 21e0621e3cd7d046715c1cbcbe70ecd34ddd5208 (diff) | |
download | linux-a4887ea588e9bf515e43094bb09be21e13ee0908.tar.xz |
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')
-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 2975e80..9a67ae3 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, if (iface_desc->desc.bInterfaceClass != 0x0A) return -ENODEV; + if (iface_desc->desc.bNumEndpoints < 1) + return -ENODEV; + /* allocate memory for our device state and initialize it */ dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (dev == NULL) |