diff options
| author | Johan Hovold <johan@kernel.org> | 2017-03-16 14:41:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-30 03:41:23 -0400 |
| commit | b1feb4e5aab4e29b9929c696d702d02a789bc8b1 (patch) | |
| tree | 93a8e33e54e79baf6dff347cf149d9ccc1ce6703 /drivers/input/tablet | |
| parent | 83d920e464fafb738be14096cd1cf3c983d8bab4 (diff) | |
Input: kbtab - validate number of endpoints before using them
commit cb1b494663e037253337623bf1ef2df727883cb7 upstream.
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack 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/tablet')
| -rw-r--r-- | drivers/input/tablet/kbtab.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c index e850d7e8afbc..4d9d64908b59 100644 --- a/drivers/input/tablet/kbtab.c +++ b/drivers/input/tablet/kbtab.c | |||
| @@ -122,6 +122,9 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
| 122 | struct input_dev *input_dev; | 122 | struct input_dev *input_dev; |
| 123 | int error = -ENOMEM; | 123 | int error = -ENOMEM; |
| 124 | 124 | ||
| 125 | if (intf->cur_altsetting->desc.bNumEndpoints < 1) | ||
| 126 | return -ENODEV; | ||
| 127 | |||
| 125 | kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL); | 128 | kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL); |
| 126 | input_dev = input_allocate_device(); | 129 | input_dev = input_allocate_device(); |
| 127 | if (!kbtab || !input_dev) | 130 | if (!kbtab || !input_dev) |
