summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-03-21 09:50:36 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-08 13:45:53 -0300
commit31c5f0c5e25ed71eeced170f113bb590f2f1f6f3 (patch)
tree73100c9b4f3fcf2fd556e0ed12a1707f3576a302 /drivers/media/video/uvc
parentaeebb1b3146a70bf02d0115a2be690d856d12e8c (diff)
downloadop-kernel-dev-31c5f0c5e25ed71eeced170f113bb590f2f1f6f3.zip
op-kernel-dev-31c5f0c5e25ed71eeced170f113bb590f2f1f6f3.tar.gz
[media] uvcvideo: Fix ENUMINPUT handling
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> Cc: stable@vger.kernel.org Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc')
-rw-r--r--drivers/media/video/uvc/uvc_v4l2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index a3322ed..759bef8 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -694,7 +694,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
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))
OpenPOWER on IntegriCloud