diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-14 09:33:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 09:12:42 -0700 |
| commit | 5c91a520b0d6d2700c96d3b8198d7e3cfddce538 (patch) | |
| tree | 287c81fee8eb0b7708c62a82abb4dcd5fbda29b6 /drivers/input | |
| parent | 4d7abf448e8f16d7be928f394a592f9458af1c59 (diff) | |
| download | lwn-5c91a520b0d6d2700c96d3b8198d7e3cfddce538.tar.gz lwn-5c91a520b0d6d2700c96d3b8198d7e3cfddce538.zip | |
Input: powermate - fix oops with malicious USB descriptors
commit 9c6ba456711687b794dcf285856fc14e2c76074f upstream.
The powermate driver expects at least one valid USB endpoint in its
probe function. If given malicious descriptors that specify 0 for
the number of endpoints, it will crash. Validate the number of
endpoints on the interface before using them.
The full report for this issue can be found here:
http://seclists.org/bugtraq/2016/Mar/85
Reported-by: Ralf Spenneberg <ralf@spenneberg.net>
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/misc/powermate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c index 63b539d3daba..84909a12ff36 100644 --- a/drivers/input/misc/powermate.c +++ b/drivers/input/misc/powermate.c @@ -307,6 +307,9 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i int error = -ENOMEM; interface = intf->cur_altsetting; + if (interface->desc.bNumEndpoints < 1) + return -EINVAL; + endpoint = &interface->endpoint[0].desc; if (!usb_endpoint_is_int_in(endpoint)) return -EIO; |