Skip to content

Commit 41ebaa5

Browse files
ribaldaHans Verkuil
authored andcommitted
media: uvcvideo: Fix OOB read
If the index provided by the user is bigger than the mask size, we might do an out of bound read. CC: stable@kernel.org Fixes: 40140ed ("media: uvcvideo: Implement mask for V4L2_CTRL_TYPE_MENU") Reported-by: Zubin Mithra <zsm@chromium.org> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
1 parent 861ab81 commit 41ebaa5

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/media/usb/uvc/uvc_ctrl.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,6 +1402,9 @@ int uvc_query_v4l2_menu(struct uvc_video_chain *chain,
14021402
query_menu->id = id;
14031403
query_menu->index = index;
14041404

1405+
if (index >= BITS_PER_TYPE(mapping->menu_mask))
1406+
return -EINVAL;
1407+
14051408
ret = mutex_lock_interruptible(&chain->ctrl_mutex);
14061409
if (ret < 0)
14071410
return -ERESTARTSYS;

0 commit comments

Comments
 (0)