2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index b1dc3e507fc1..2ae4f880ea05 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -58,6 +58,15 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
                 break;
 
         case V4L2_CTRL_TYPE_MENU:
+                /* Prevent excessive memory consumption, as well as integer
+                 * overflows.
+                 */
+                if (xmap->menu_count == 0 ||
+                    xmap->menu_count > UVC_MAX_CONTROL_MENU_ENTRIES) {
+                        ret = -EINVAL;
+                        goto done;
+                }
+
                 size = xmap->menu_count * sizeof(*map->menu_info);
                 map->menu_info = kmalloc(size, GFP_KERNEL);
                 if (map->menu_info == NULL) {
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index e9c19f53e4a1..67f88d85bb16 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -114,6 +114,7 @@
 
 /* Maximum allowed number of control mappings per device */
 #define UVC_MAX_CONTROL_MAPPINGS        1024
+#define UVC_MAX_CONTROL_MENU_ENTRIES    32
 
 /* Devices quirks */
 #define UVC_QUIRK_STATUS_INTERVAL       0x00000001