diff options
| author | Johan Hovold <johan@kernel.org> | 2017-03-16 14:39:29 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-30 03:41:23 -0400 |
| commit | d9a3e6424e6147d6e9ae16c845e596516ddf807a (patch) | |
| tree | 154b018636a56bdd605d81470ce7acb872dbcc9a | |
| parent | 1f5a512844a85690df614db3a6d8dbb54e662391 (diff) | |
Input: hanwang - validate number of endpoints before using them
commit ba340d7b83703768ce566f53f857543359aa1b98 upstream.
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.
Fixes: bba5394ad3bd ("Input: add support for Hanwang tablets")
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>
| -rw-r--r-- | drivers/input/tablet/hanwang.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/tablet/hanwang.c b/drivers/input/tablet/hanwang.c index cd852059b99e..df4bea96d7ed 100644 --- a/drivers/input/tablet/hanwang.c +++ b/drivers/input/tablet/hanwang.c | |||
| @@ -340,6 +340,9 @@ static int hanwang_probe(struct usb_interface *intf, const struct usb_device_id | |||
| 340 | int error; | 340 | int error; |
| 341 | int i; | 341 | int i; |
| 342 | 342 | ||
| 343 | if (intf->cur_altsetting->desc.bNumEndpoints < 1) | ||
| 344 | return -ENODEV; | ||
| 345 | |||
| 343 | hanwang = kzalloc(sizeof(struct hanwang), GFP_KERNEL); | 346 | hanwang = kzalloc(sizeof(struct hanwang), GFP_KERNEL); |
| 344 | input_dev = input_allocate_device(); | 347 | input_dev = input_allocate_device(); |
| 345 | if (!hanwang || !input_dev) { | 348 | if (!hanwang || !input_dev) { |