diff options
author | Vladis Dronov <vdronov@redhat.com> | 2016-03-31 13:53:42 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-31 16:10:00 -0400 |
commit | 162f98dea487206d9ab79fc12ed64700667a894d (patch) | |
tree | 8096aa47a878805cb4b98ae08599b2ef32671edf | |
parent | d314e9e80c5ea561b73584b73806c2ae9e30f503 (diff) |
Input: gtco - fix crash on detecting device without endpoints
The gtco driver expects at least one valid endpoint. If given malicious
descriptors that specify 0 for the number of endpoints, it will crash in
the probe function. Ensure there is at least one endpoint on the interface
before using it.
Also let's fix a minor coding style issue.
The full correct report of this issue can be found in the public
Red Hat Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=1283385
Reported-by: Ralf Spenneberg <ralf@spenneberg.net>
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/tablet/gtco.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c index 3a7f3a4a4396..7c18249d6c8e 100644 --- a/drivers/input/tablet/gtco.c +++ b/drivers/input/tablet/gtco.c | |||
@@ -858,6 +858,14 @@ static int gtco_probe(struct usb_interface *usbinterface, | |||
858 | goto err_free_buf; | 858 | goto err_free_buf; |
859 | } | 859 | } |
860 | 860 | ||
861 | /* Sanity check that a device has an endpoint */ | ||
862 | if (usbinterface->altsetting[0].desc.bNumEndpoints < 1) { | ||
863 | dev_err(&usbinterface->dev, | ||
864 | "Invalid number of endpoints\n"); | ||
865 | error = -EINVAL; | ||
866 | goto err_free_urb; | ||
867 | } | ||
868 | |||
861 | /* | 869 | /* |
862 | * The endpoint is always altsetting 0, we know this since we know | 870 | * The endpoint is always altsetting 0, we know this since we know |
863 | * this device only has one interrupt endpoint | 871 | * this device only has one interrupt endpoint |
@@ -879,7 +887,7 @@ static int gtco_probe(struct usb_interface *usbinterface, | |||
879 | * HID report descriptor | 887 | * HID report descriptor |
880 | */ | 888 | */ |
881 | if (usb_get_extra_descriptor(usbinterface->cur_altsetting, | 889 | if (usb_get_extra_descriptor(usbinterface->cur_altsetting, |
882 | HID_DEVICE_TYPE, &hid_desc) != 0){ | 890 | HID_DEVICE_TYPE, &hid_desc) != 0) { |
883 | dev_err(&usbinterface->dev, | 891 | dev_err(&usbinterface->dev, |
884 | "Can't retrieve exta USB descriptor to get hid report descriptor length\n"); | 892 | "Can't retrieve exta USB descriptor to get hid report descriptor length\n"); |
885 | error = -EIO; | 893 | error = -EIO; |