diff options
| author |   Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-14 09:33:40 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-14 09:36:49 -0700 |
| commit | 9c6ba456711687b794dcf285856fc14e2c76074f (patch) | |
| tree | d2b3ecc6afacca69b576081d21fc6a9b99bdec42 /drivers/input | |
| parent | Input: snvs_pwrkey - fix returned value check of syscon_regmap_lookup_by_phandle() (diff) | |
| download | linux-dev-9c6ba456711687b794dcf285856fc14e2c76074f.tar.xz linux-dev-9c6ba456711687b794dcf285856fc14e2c76074f.zip | |
Input: powermate - fix oops with malicious USB descriptors
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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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; |