Patch "media: uvcvideo: Prevent heap overflow when accessing mapped controls" has been added to the 3.18-stable tree

This is a note to let you know that I've just added the patch titled

media: uvcvideo: Prevent heap overflow when accessing mapped controls

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
media-uvcvideo-prevent-heap-overflow-when-accessing-mapped-controls.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Guenter Roeck <[email protected]>
Date: Tue, 8 Aug 2017 08:56:21 -0400
Subject: media: uvcvideo: Prevent heap overflow when accessing mapped controls

From: Guenter Roeck <[email protected]>

commit 7e09f7d5c790278ab98e5f2c22307ebe8ad6e8ba upstream.

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 <[email protected]>

---
 drivers/media/usb/uvc/uvc_ctrl.c |    7 +++++++
 1 file changed, 7 insertions(+)

@@ -2001,6 +2001,13 @@ int uvc_ctrl_add_mapping(struct uvc_vide
 		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) {
 		if (mapping->id == map->id) {
 			uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', "

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/media-uvcvideo-prevent-heap-overflow-when-accessing-mapped-controls.patch