Skip to content

Commit 4931578

Browse files
groeckgregkh
authored andcommitted
media: uvcvideo: Prevent heap overflow when accessing mapped controls
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 <rssimmo@amazon.com> 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 04affe4 commit 4931578

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/media/usb/uvc/uvc_ctrl.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,6 +2001,13 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
20012001
goto done;
20022002
}
20032003

2004+
/* Validate the user-provided bit-size and offset */
2005+
if (mapping->size > 32 ||
2006+
mapping->offset + mapping->size > ctrl->info.size * 8) {
2007+
ret = -EINVAL;
2008+
goto done;
2009+
}
2010+
20042011
list_for_each_entry(map, &ctrl->info.mappings, list) {
20052012
if (mapping->id == map->id) {
20062013
uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s', "

0 commit comments

Comments
 (0)