[linux] 01/01: media: usbvision: fix crash on detecting device with invalid configuration

Tue Nov 24 18:11:36 UTC 2015

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch squeeze-security
in repository linux.

commit b745b994a839287fd8e900bad59026e77abff825
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Nov 24 18:09:32 2015 +0000

    media: usbvision: fix crash on detecting device with invalid configuration
    
    (CVE-2015-7833, already partly fixed)
    
    Also update headers of the previous patch to match the commit in
    media_tree.git.
---
 debian/changelog                                   |  4 ++-
 ...sion-fix-crash-on-detecting-device-with-i.patch | 42 ++++++++++++++++++++++
 ...sbvision-fix-overflow-of-interfaces-array.patch |  9 +++--
 debian/patches/series/48squeeze17                  |  3 +-
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 062a441..59d53ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
 linux-2.6 (2.6.32-48squeeze17) UNRELEASED; urgency=medium
 
-  * usbvision: fix overflow of interfaces array (CVE-2015-7833)
   * RDS: fix race condition when sending a message on unbound socket
     (CVE-2015-7990)
   * isdn_ppp: Add checks for allocation failure in isdn_ppp_open()
   * ppp, slip: Validate VJ compression slot parameters completely
     (CVE-2015-7799)
+  * media: usbvision: fix overflow of interfaces array (CVE-2015-7833)
+  * media: usbvision: fix crash on detecting device with invalid
+    configuration (CVE-2015-7833)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 08 Nov 2015 13:41:21 +0000
 
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..fb55974
--- /dev/null
+++ b/debian/patches/bugfix/all/media-usbvision-fix-crash-on-detecting-device-with-i.patch
@@ -0,0 +1,42 @@
+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>
+[bwh: Backport to 2.6.32: adjust filename, context]
+---
+--- a/drivers/media/video/usbvision/usbvision-video.c
++++ b/drivers/media/video/usbvision/usbvision-video.c
+@@ -1660,10 +1660,23 @@ static int __devinit usbvision_probe(str
+ 
+ 	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 dadd518..4fd4e4f 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,13 +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>
+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>
 [bwh: Backported to 2.6.32: adjust filename, context]
 ---
  drivers/media/video/usbvision/usbvision-video.c | 7 +++++++
diff --git a/debian/patches/series/48squeeze17 b/debian/patches/series/48squeeze17
index d284e6c..9f4c0e0 100644
--- a/debian/patches/series/48squeeze17
+++ b/debian/patches/series/48squeeze17
@@ -1,4 +1,5 @@
-+ bugfix/all/usbvision-fix-overflow-of-interfaces-array.patch
 + bugfix/all/rds-fix-race-condition-when-sending-a-message-on-unbound-socket.patch
 + bugfix/all/isdn_ppp-add-checks-for-allocation-failure-in-isdn_p.patch
 + bugfix/all/ppp-slip-validate-vj-compression-slot-parameters-com.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

