From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from www.linuxtv.org ([130.149.80.248]:42600 "EHLO www.linuxtv.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752769AbdHTMMf (ORCPT ); Sun, 20 Aug 2017 08:12:35 -0400 From: Mauro Carvalho Chehab Date: Sun, 20 Aug 2017 12:08:34 +0000 Subject: [git:media_tree/master] media: uvcvideo: Prevent heap overflow when accessing mapped controls To: linuxtv-commits@linuxtv.org Cc: stable@vger.kernel.org, Laurent Pinchart , Richard Simmons , Guenter Roeck , Hans Verkuil Reply-to: linux-media@vger.kernel.org Message-Id: Sender: stable-owner@vger.kernel.org List-ID: This is an automatic generated email to let you know that the following patch were queued: Subject: media: uvcvideo: Prevent heap overflow when accessing mapped controls Author: Guenter Roeck Date: Tue Aug 8 08:56:21 2017 -0400 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 Cc: stable@vger.kernel.org Signed-off-by: Guenter Roeck Reviewed-by: Laurent Pinchart Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/media/usb/uvc/uvc_ctrl.c | 7 +++++++ 1 file changed, 7 insertions(+) --- diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index c2ee6e39fd0c..20397aba6849 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2002,6 +2002,13 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain, 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', "