diff options
| author | Johan Hovold <johan@kernel.org> | 2017-03-16 14:34:02 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-30 03:41:22 -0400 |
| commit | 0afac79f6696c78ea2006af8d39b296d285db802 (patch) | |
| tree | 7867bffbdfb129f237698bb1ace7be6b079bee29 /drivers/input | |
| parent | de2ba8081e6dc6fbc0e450098eb520994676f260 (diff) | |
Input: iforce - validate number of endpoints before using them
commit 59cf8bed44a79ec42303151dd014fdb6434254bb upstream.
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory that lie beyond the end of the endpoint
array should a malicious device lack the expected endpoints.
Signed-off-by: Johan Hovold <johan@kernel.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/joystick/iforce/iforce-usb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index d96aa27dfcdc..db64adfbe1af 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c | |||
| @@ -141,6 +141,9 @@ static int iforce_usb_probe(struct usb_interface *intf, | |||
| 141 | 141 | ||
| 142 | interface = intf->cur_altsetting; | 142 | interface = intf->cur_altsetting; |
| 143 | 143 | ||
| 144 | if (interface->desc.bNumEndpoints < 2) | ||
| 145 | return -ENODEV; | ||
| 146 | |||
| 144 | epirq = &interface->endpoint[0].desc; | 147 | epirq = &interface->endpoint[0].desc; |
| 145 | epout = &interface->endpoint[1].desc; | 148 | epout = &interface->endpoint[1].desc; |
| 146 | 149 | ||
