3.4-stable patches

added patches:
	media-uvcvideo-fix-enuminput-handling.patch
	smsusb-add-autodetection-support-for-usb-id-2040-c0a0.patch

diff --git a/queue-3.4/media-uvcvideo-fix-enuminput-handling.patch b/queue-3.4/media-uvcvideo-fix-enuminput-handling.patch
new file mode 100644 (file)
index 0000000..c134e62
--- /dev/null
+++ b/queue-3.4/media-uvcvideo-fix-enuminput-handling.patch
@@ -0,0 +1,32 @@
+From 31c5f0c5e25ed71eeced170f113bb590f2f1f6f3 Mon Sep 17 00:00:00 2001
+From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Date: Wed, 21 Mar 2012 09:50:36 -0300
+Subject: media: uvcvideo: Fix ENUMINPUT handling
+
+From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+
+commit 31c5f0c5e25ed71eeced170f113bb590f2f1f6f3 upstream.
+
+Properly validate the user-supplied index against the number of inputs.
+The code used the pin local variable instead of the index by mistake.
+
+Reported-by: Jozef Vesely <vesely@gjh.sk>
+Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/video/uvc/uvc_v4l2.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/video/uvc/uvc_v4l2.c
++++ b/drivers/media/video/uvc/uvc_v4l2.c
+@@ -687,7 +687,7 @@ static long uvc_v4l2_do_ioctl(struct fil
+                                       break;
+                       }
+                       pin = iterm->id;
+-              } else if (pin < selector->bNrInPins) {
++              } else if (index < selector->bNrInPins) {
+                       pin = selector->baSourceID[index];
+                       list_for_each_entry(iterm, &chain->entities, chain) {
+                               if (!UVC_ENTITY_IS_ITERM(iterm))

diff --git a/queue-3.4/series b/queue-3.4/series
index 87062d8445f924237f4e1d2ee2555aceddc0ae16..7a4fe132820df9d5f52f6525fe044b4f47f14441 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -71,3 +71,5 @@ spi-spi-fsl-spi-reference-correct-pdata-in.patch
 hvc_xen-null-dereference-on-allocation-failure.patch
 xen-do-not-map-the-same-gsi-twice-in-pvhvm-guests.patch
 nouveau-nouveau_set_bo_placement-takes-ttm-flags.patch
+smsusb-add-autodetection-support-for-usb-id-2040-c0a0.patch
+media-uvcvideo-fix-enuminput-handling.patch

diff --git a/queue-3.4/smsusb-add-autodetection-support-for-usb-id-2040-c0a0.patch b/queue-3.4/smsusb-add-autodetection-support-for-usb-id-2040-c0a0.patch
new file mode 100644 (file)
index 0000000..41c1e8b
--- /dev/null
+++ b/queue-3.4/smsusb-add-autodetection-support-for-usb-id-2040-c0a0.patch
@@ -0,0 +1,28 @@
+From 4d1b58b84472d1d300a66e1c5fd765b21e74ba15 Mon Sep 17 00:00:00 2001
+From: Michael Krufky <mkrufky@linuxtv.org>
+Date: Thu, 22 Mar 2012 13:55:05 -0300
+Subject: [media] smsusb: add autodetection support for USB ID 2040:c0a0
+
+From: Michael Krufky <mkrufky@linuxtv.org>
+
+commit 4d1b58b84472d1d300a66e1c5fd765b21e74ba15 upstream.
+
+Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/dvb/siano/smsusb.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/media/dvb/siano/smsusb.c
++++ b/drivers/media/dvb/siano/smsusb.c
+@@ -542,6 +542,8 @@ static const struct usb_device_id smsusb
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+       { USB_DEVICE(0x2040, 0xc090),
+               .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
++      { USB_DEVICE(0x2040, 0xc0a0),
++              .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+       { } /* Terminating entry */
+       };
+