[linux] 01/01: media: usbvision: fix crash on detecting device with invalid configuration
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Tue Nov 24 17:38:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch jessie-security
in repository linux.
commit a6a507eead78b5073d37c916e7081b516a98d69c
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Tue Nov 24 17:37:56 2015 +0000
media: usbvision: fix crash on detecting device with invalid configuration
(CVE-2015-7833, partly fixed in 3.16.7-ckt11-1+deb8u6)
Also update headers of the previous patch to match the commit in
media_tree.git.
---
debian/changelog | 5 +++
...sion-fix-crash-on-detecting-device-with-i.patch | 44 ++++++++++++++++++++++
...sbvision-fix-overflow-of-interfaces-array.patch | 10 +++--
debian/patches/series | 3 +-
4 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 60d76db..13f8a95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
linux (3.16.7-ckt11-1+deb8u7) UNRELEASED; urgency=medium
+ [ Salvatore Bonaccorso ]
* [x86] KVM: svm: unconditionally intercept #DB (CVE-2015-8104)
* [x86] KVM: rename update_db_bp_intercept to update_bp_intercept
+ [ Ben Hutchings ]
+ * media: usbvision: fix crash on detecting device with invalid configuration
+ (CVE-2015-7833, partly fixed in 3.16.7-ckt11-1+deb8u6)
+
-- Salvatore Bonaccorso <carnil at debian.org> Sun, 15 Nov 2015 10:01:10 +0100
linux (3.16.7-ckt11-1+deb8u6) jessie-security; urgency=medium
diff --git a/debian/patches/bugfix/all/media-usbvision-fix-crash-on-detecting-device-with-i.patch b/debian/patches/bugfix/all/media-usbvision-fix-crash-on-detecting-device-with-i.patch
new file mode 100644
index 0000000..656e126
--- /dev/null
+++ b/debian/patches/bugfix/all/media-usbvision-fix-crash-on-detecting-device-with-i.patch
@@ -0,0 +1,44 @@
+From: Vladis Dronov <vdronov at redhat.com>
+Date: Mon, 16 Nov 2015 15:55:11 -0200
+Subject: [media] usbvision: fix crash on detecting device with invalid
+ configuration
+Origin: http://git.linuxtv.org/cgit.cgi/media_tree.git/commit?id=fa52bd506f274b7619955917abfde355e3d19ffe
+
+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 at spenneberg.net>
+Signed-off-by: Vladis Dronov <vdronov at redhat.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
+---
+ drivers/media/usb/usbvision/usbvision-video.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+--- a/drivers/media/usb/usbvision/usbvision-video.c
++++ b/drivers/media/usb/usbvision/usbvision-video.c
+@@ -1545,9 +1545,23 @@ static int usbvision_probe(struct usb_in
+
+ 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);
diff --git a/debian/patches/bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch b/debian/patches/bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch
index f6bc4fb..0176090 100644
--- a/debian/patches/bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch
+++ b/debian/patches/bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch
@@ -1,14 +1,16 @@
From: Oliver Neukum <oneukum at suse.com>
-Date: Tue, 27 Oct 2015 12:42:38 +0100
-Subject: usbvision fix overflow of interfaces array
-Origin: https://bugzilla.novell.com/attachment.cgi?id=653350
+Date: Tue, 27 Oct 2015 09:51:34 -0200
+Subject: [media] usbvision fix overflow of interfaces array
+Origin: http://git.linuxtv.org/cgit.cgi/media_tree.git/commit?id=588afcc1c0e45358159090d95bf7b246fb67565f
This fixes the crash reported in:
http://seclists.org/bugtraq/2015/Oct/35
The interface number needs a sanity check.
Signed-off-by: Oliver Neukum <oneukum at suse.com>
-[bwh: Backported to 3.16: adjust context]
+Cc: Vladis Dronov <vdronov at redhat.com>
+Signed-off-by: Hans Verkuil <hans.verkuil at cisco.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
---
drivers/media/usb/usbvision/usbvision-video.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/patches/series b/debian/patches/series
index b4ac20f..7676a2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -655,9 +655,10 @@ bugfix/all/Initialize-msg-shm-IPC-objects-before-doing-ipc_addid.patch
bugfix/all/KEYS-Fix-race-between-key-destruction-and-finding-a-.patch
bugfix/all/KEYS-Fix-crash-when-attempt-to-garbage-collect-an-un.patch
bugfix/all/KEYS-Don-t-permit-request_key-to-construct-a-new-key.patch
-bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch
bugfix/all/rds-fix-race-condition-when-sending-a-message-on-unbound-socket.patch
bugfix/x86/kvm-x86-vmx-avoid-guest-host-dos-by-intercepting-ac.patch
bugfix/x86/kvm-x86-svm-intercept-ac-to-avoid-guest-host-exploit.patch
bugfix/x86/kvm-svm-unconditionally-intercept-DB.patch
bugfix/x86/kvm-x86-rename-update_db_bp_intercept-to-update_bp_i.patch
+bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch
+bugfix/all/media-usbvision-fix-crash-on-detecting-device-with-i.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list