diff options
| author | Johan Hovold | 2017-03-13 13:47:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-03-14 17:07:30 +0800 |
| commit | f259ca3eed6e4b79ac3d5c5c9fb259fb46e86217 (patch) | |
| tree | e62c9397893c0e0ae3a6d30c25e4f122af446b4d /drivers/usb | |
| parent | 1dc56c52d2484be09c7398a5207d6b11a4256be9 (diff) | |
USB: uss720: fix NULL-deref at probe
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.
Note that the endpoint access that causes the NULL-deref is currently
only used for debugging purposes during probe so the oops only happens
when dynamic debugging is enabled. This means the driver could be
rewritten to continue to accept device with only two endpoints, should
such devices exist.
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/misc/uss720.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index e45a3a680db8..07014cad6dbe 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c @@ -709,6 +709,11 @@ static int uss720_probe(struct usb_interface *intf, interface = intf->cur_altsetting; + if (interface->desc.bNumEndpoints < 3) { + usb_put_dev(usbdev); + return -ENODEV; + } + /* * Allocate parport interface */ |