diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-07 10:11:04 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-09 04:25:37 -0500 |
commit | de46e56653de7b3b54baa625bd582635008b8d05 (patch) | |
tree | cdd5e50e19094bfb45dc014d0819e3072da53726 | |
parent | b7321e81fc369abe353cf094d4f0dc2fe11ab95f (diff) |
USB: iowarrior: fix NULL-deref in write
Make sure to verify that we have the required interrupt-out endpoint for
IOWarrior56 devices to avoid dereferencing a NULL-pointer in write
should a malicious device lack such an endpoint.
Fixes: 946b960d13c1 ("USB: add driver for iowarrior devices.")
Cc: stable <stable@vger.kernel.org> # 2.6.21
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/misc/iowarrior.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index 3ad058cbe6ca..37c63cb39714 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
@@ -798,6 +798,14 @@ static int iowarrior_probe(struct usb_interface *interface, | |||
798 | goto error; | 798 | goto error; |
799 | } | 799 | } |
800 | 800 | ||
801 | if (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56) { | ||
802 | if (!dev->int_out_endpoint) { | ||
803 | dev_err(&interface->dev, "no interrupt-out endpoint found\n"); | ||
804 | retval = -ENODEV; | ||
805 | goto error; | ||
806 | } | ||
807 | } | ||
808 | |||
801 | /* we have to check the report_size often, so remember it in the endianness suitable for our machine */ | 809 | /* we have to check the report_size often, so remember it in the endianness suitable for our machine */ |
802 | dev->report_size = usb_endpoint_maxp(dev->int_in_endpoint); | 810 | dev->report_size = usb_endpoint_maxp(dev->int_in_endpoint); |
803 | if ((dev->interface->cur_altsetting->desc.bInterfaceNumber == 0) && | 811 | if ((dev->interface->cur_altsetting->desc.bInterfaceNumber == 0) && |