diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-12-01 14:55:42 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-12-01 14:55:49 -0500 |
| commit | 6ba2a2ca010070abcef6744440e5e2dbf977d101 (patch) | |
| tree | 135cab29b9cefb423202613c5e3c12c2105fdc68 /usbvision-fix-crash-on-detecting-device-with-invalid.patch | |
| parent | 3bb9b28cd9e2031a04eb4b82414d881bda2669ac (diff) | |
| download | kernel-6ba2a2ca010070abcef6744440e5e2dbf977d101.tar.gz kernel-6ba2a2ca010070abcef6744440e5e2dbf977d101.tar.xz kernel-6ba2a2ca010070abcef6744440e5e2dbf977d101.zip | |
CVE-2015-7833 usbvision: crash on invalid device descriptors (rhbz 1270158 1270160)
Diffstat (limited to 'usbvision-fix-crash-on-detecting-device-with-invalid.patch')
| -rw-r--r-- | usbvision-fix-crash-on-detecting-device-with-invalid.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/usbvision-fix-crash-on-detecting-device-with-invalid.patch b/usbvision-fix-crash-on-detecting-device-with-invalid.patch new file mode 100644 index 000000000..a03e37907 --- /dev/null +++ b/usbvision-fix-crash-on-detecting-device-with-invalid.patch @@ -0,0 +1,49 @@ +From 2ea39fc263c6a7589e15edb7d2d1c89fa569be53 Mon Sep 17 00:00:00 2001 +From: Vladis Dronov <vdronov@redhat.com> +Date: Mon, 16 Nov 2015 15:55:11 -0200 +Subject: [PATCH] usbvision: fix crash on detecting device with invalid + configuration + +The usbvision driver crashes when a specially crafted usb device with invalid +number of interfaces or endpoints is detected. This fix adds checks that the +device has proper configuration expected by the driver. + +Reported-by: Ralf Spenneberg <ralf@spenneberg.net> +Signed-off-by: Vladis Dronov <vdronov@redhat.com> +Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> +--- + drivers/media/usb/usbvision/usbvision-video.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c +index b693206f66dd..d1dc1a198e3e 100644 +--- a/drivers/media/usb/usbvision/usbvision-video.c ++++ b/drivers/media/usb/usbvision/usbvision-video.c +@@ -1463,9 +1463,23 @@ static int usbvision_probe(struct usb_interface *intf, + + if (usbvision_device_data[model].interface >= 0) + interface = &dev->actconfig->interface[usbvision_device_data[model].interface]->altsetting[0]; +- else ++ else if (ifnum < dev->actconfig->desc.bNumInterfaces) + interface = &dev->actconfig->interface[ifnum]->altsetting[0]; ++ else { ++ dev_err(&intf->dev, "interface %d is invalid, max is %d\n", ++ ifnum, dev->actconfig->desc.bNumInterfaces - 1); ++ ret = -ENODEV; ++ goto err_usb; ++ } ++ ++ if (interface->desc.bNumEndpoints < 2) { ++ dev_err(&intf->dev, "interface %d has %d endpoints, but must" ++ " have minimum 2\n", ifnum, interface->desc.bNumEndpoints); ++ ret = -ENODEV; ++ goto err_usb; ++ } + endpoint = &interface->endpoint[1].desc; ++ + if (!usb_endpoint_xfer_isoc(endpoint)) { + dev_err(&intf->dev, "%s: interface %d. has non-ISO endpoint!\n", + __func__, ifnum); +-- +2.5.0 + |