From: Greg Kroah-Hartman Date: Fri, 25 May 2012 06:17:35 +0000 (+0900) Subject: 3.0-stable patches X-Git-Tag: v3.0.33~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83f8538723fd8b2cced98ac17b5156d94000ffdb;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-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.0/media-uvcvideo-fix-enuminput-handling.patch b/queue-3.0/media-uvcvideo-fix-enuminput-handling.patch new file mode 100644 index 00000000000..187e0423253 --- /dev/null +++ b/queue-3.0/media-uvcvideo-fix-enuminput-handling.patch @@ -0,0 +1,32 @@ +From 31c5f0c5e25ed71eeced170f113bb590f2f1f6f3 Mon Sep 17 00:00:00 2001 +From: Laurent Pinchart +Date: Wed, 21 Mar 2012 09:50:36 -0300 +Subject: media: uvcvideo: Fix ENUMINPUT handling + +From: Laurent Pinchart + +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 +Signed-off-by: Laurent Pinchart +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -710,7 +710,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.0/series b/queue-3.0/series index 3fa6eec0168..87fad718b90 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -20,7 +20,6 @@ ahci-detect-marvell-88se9172-sata-controller.patch um-fix-__swp_type.patch um-implement-a-custom-pte_same-function.patch docs-update-howto-for-2.6.x-3.x-versioning.patch -usb-cdc-wdm-sanitize-error-returns.patch usb-cdc-wdm-poll-must-return-pollhup-if-device-is-gone.patch workqueue-skip-nr_running-sanity-check-in-worker_enter_idle-if-trustee-is-active.patch mm-mempolicy-let-vma_merge-and-vma_split-handle.patch @@ -47,3 +46,5 @@ drm-i915-avoid-a-double-read-of-pch_iir-during-interrupt-handling.patch drm-i915-use-hw-scheduler-for-fixed-function-shaders.patch drm-i915-don-t-clobber-the-pipe-param-in-sanitize_modesetting.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.0/smsusb-add-autodetection-support-for-usb-id-2040-c0a0.patch b/queue-3.0/smsusb-add-autodetection-support-for-usb-id-2040-c0a0.patch new file mode 100644 index 00000000000..888bb791985 --- /dev/null +++ b/queue-3.0/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 +Date: Thu, 22 Mar 2012 13:55:05 -0300 +Subject: [media] smsusb: add autodetection support for USB ID 2040:c0a0 + +From: Michael Krufky + +commit 4d1b58b84472d1d300a66e1c5fd765b21e74ba15 upstream. + +Signed-off-by: Michael Krufky +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -541,6 +541,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 */ + }; + diff --git a/queue-3.0/usb-cdc-wdm-sanitize-error-returns.patch b/queue-3.0/usb-cdc-wdm-sanitize-error-returns.patch deleted file mode 100644 index 637043d8a40..00000000000 --- a/queue-3.0/usb-cdc-wdm-sanitize-error-returns.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 24a85bae5da2b43fed423859c09c5a81ab359473 Mon Sep 17 00:00:00 2001 -From: Oliver Neukum -Date: Fri, 27 Apr 2012 14:23:54 +0200 -Subject: USB: cdc-wdm: sanitize error returns - -From: Oliver Neukum - -commit 24a85bae5da2b43fed423859c09c5a81ab359473 upstream. - -wdm_flush() returns unsanitized USB error codes. -They must be cleaned up to before being anded to user space - -Signed-off-by: Oliver Neukum -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/class/cdc-wdm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/class/cdc-wdm.c -+++ b/drivers/usb/class/cdc-wdm.c -@@ -500,7 +500,7 @@ static int wdm_flush(struct file *file, - dev_err(&desc->intf->dev, "Error in flush path: %d\n", - desc->werr); - -- return desc->werr; -+ return usb_translate_errors(desc->werr); - } - - static unsigned int wdm_poll(struct file *file, struct poll_table_struct *wait)