Patch "[media] usbvision: fix NULL-deref at probe" has been added to the 4.4-stable tree

Patch "[media] usbvision: fix NULL-deref at probe" has been added to the 4.4-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    [media] usbvision: fix NULL-deref at probe

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     usbvision-fix-null-deref-at-probe.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From eacb975b48272f54532b62f515a3cf7eefa35123 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Mon, 13 Mar 2017 09:53:55 -0300
Subject: [media] usbvision: fix NULL-deref at probe

From: Johan Hovold <johan@kernel.org>

commit eacb975b48272f54532b62f515a3cf7eefa35123 upstream.

Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.

Fixes: 2a9f8b5d25be ("V4L/DVB (5206): Usbvision: set alternate interface
modification")

Cc: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/media/usb/usbvision/usbvision-video.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -1523,7 +1523,14 @@ static int usbvision_probe(struct usb_in
 	}
 
 	for (i = 0; i < usbvision->num_alt; i++) {
-		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[1].desc.
+		u16 tmp;
+
+		if (uif->altsetting[i].desc.bNumEndpoints < 2) {
+			ret = -ENODEV;
+			goto err_pkt;
+		}
+
+		tmp = le16_to_cpu(uif->altsetting[i].endpoint[1].desc.
 				      wMaxPacketSize);
 		usbvision->alt_max_pkt_size[i] =
 			(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);


Patches currently in stable-queue which might be from johan@kernel.org are

queue-4.4/usb-serial-io_ti-fix-div-by-zero-in-set_termios.patch
queue-4.4/usb-hub-fix-non-ss-hub-descriptor-handling.patch
queue-4.4/usb-serial-ftdi_sio-add-olimex-arm-usb-tiny-h-pids.patch
queue-4.4/usb-serial-ftdi_sio-fix-setting-latency-for-unprivileged-users.patch
queue-4.4/usb-iowarrior-fix-info-ioctl-on-big-endian-hosts.patch
queue-4.4/watchdog-pcwd_usb-fix-null-deref-at-probe.patch
queue-4.4/usb-serial-qcserial-add-more-lenovo-em74xx-device-ids.patch
queue-4.4/usb-serial-option-add-telit-me910-support.patch
queue-4.4/net-irda-irda-usb-fix-firmware-name-on-big-endian-hosts.patch
queue-4.4/usbvision-fix-null-deref-at-probe.patch
queue-4.4/usb-serial-mct_u232-fix-big-endian-baud-rate-handling.patch
queue-4.4/usb-ehci-platform-fix-companion-device-leak.patch
queue-4.4/mceusb-fix-null-deref-at-probe.patch
queue-4.4/usb-hub-fix-ss-hub-descriptor-handling.patch
queue-4.4/ath9k_htc-fix-null-deref-at-probe.patch