diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-13 13:47:48 +0100 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2017-06-08 00:47:05 +0200 |
commit | 712c7fb1aed1d1418dc65f2e4e2ed965271ba9e0 (patch) | |
tree | 02b5a63aaaac67c10c7395ab60c851f9c66f18c4 /drivers | |
parent | 79e603e9eed2e26d35082c52b88d0fe8f065c6c7 (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: Willy Tarreau <w@1wt.eu>
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 ce978384fda1..3b885c61b73e 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, 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) |