Commit 7e09f7d5 authored Aug 08, 2017 by Guenter Roeck Committed by Mauro Carvalho Chehab Aug 20, 2017

media: uvcvideo: Prevent heap overflow when accessing mapped controls



The size of uvc_control_mapping is user controlled leading to a
potential heap overflow in the uvc driver. This adds a check to verify
the user provided size fits within the bounds of the defined buffer
size.

Originally-from: Richard Simmons <rssimmo@amazon.com>

Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent da6df1c4

drivers/media/usb/uvc/uvc_ctrl.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2002,6 +2002,13 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
	goto done;		goto done;
	}		}

			/* Validate the user-provided bit-size and offset */
			if (mapping->size > 32 \|\|
			mapping->offset + mapping->size > ctrl->info.size * 8) {
			ret = -EINVAL;
			goto done;
			}

	list_for_each_entry(map, &ctrl->info.mappings, list) {		list_for_each_entry(map, &ctrl->info.mappings, list) {
	if (mapping->id == map->id) {		if (mapping->id == map->id) {
	uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', "		uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', "