raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

[media] uvcvideo: Fix integer overflow in uvc_ioctl_ctrl_map()

Browse Source 
There is a potential integer overflow in uvc_ioctl_ctrl_map(). When a
large xmap->menu_count is passed from the userspace, the subsequent call
to kmalloc() will allocate a buffer smaller than expected.
map->menu_count and map->menu_info would later be used in a loop (e.g.
in uvc_query_v4l2_ctrl), which leads to out-of-bound access.

The patch checks the ioctl argument and returns -EINVAL for zero or too
large values in xmap->menu_count.

Signed-off-by: Haogang Chen <haogangchen@gmail.com>
[laurent.pinchart@ideasonboard.com Prevent excessive memory consumption]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Haogang Chen
2011-11-29 18:32:25 -03:00
committed by Mauro Carvalho Chehab
parent 66847ef013
commit 806e23e95f
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/video/uvc/uvc_v4l2.c
View File

@@ -58,6 +58,15 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
break; break;
case V4L2_CTRL_TYPE_MENU: 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); size = xmap->menu_count * sizeof(*map->menu_info);
map->menu_info = kmalloc(size, GFP_KERNEL); map->menu_info = kmalloc(size, GFP_KERNEL);
if (map->menu_info == NULL) { if (map->menu_info == NULL) {

1
drivers/media/video/uvc/uvcvideo.h
View File

@@ -114,6 +114,7 @@
/* Maximum allowed number of control mappings per device */ /* Maximum allowed number of control mappings per device */
#define UVC_MAX_CONTROL_MAPPINGS 1024 #define UVC_MAX_CONTROL_MAPPINGS 1024
#define UVC_MAX_CONTROL_MENU_ENTRIES 32
/* Devices quirks */ /* Devices quirks */
#define UVC_QUIRK_STATUS_INTERVAL 0x00000001 #define UVC_QUIRK_STATUS_INTERVAL 0x00000001