linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] [media] uvcvideo: freeing an error pointer
@ 2016-11-25 10:28 Dan Carpenter
  2016-11-25 13:40 ` SF Markus Elfring
  2016-11-25 13:57 ` Laurent Pinchart
  0 siblings, 2 replies; 15+ messages in thread
From: Dan Carpenter @ 2016-11-25 10:28 UTC (permalink / raw)
  To: Laurent Pinchart, Markus Elfring
  Cc: Mauro Carvalho Chehab, linux-media, kernel-janitors

A recent cleanup introduced a potential dereference of -EFAULT when we
call kfree(map->menu_info).

Fixes: 4cc5bed1caeb ("[media] uvcvideo: Use memdup_user() rather than duplicating its implementation")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index a7e12fd..3e7e283 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -66,14 +66,14 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
 		if (xmap->menu_count == 0 ||
 		    xmap->menu_count > UVC_MAX_CONTROL_MENU_ENTRIES) {
 			ret = -EINVAL;
-			goto done;
+			goto free_map;
 		}
 
 		size = xmap->menu_count * sizeof(*map->menu_info);
 		map->menu_info = memdup_user(xmap->menu_info, size);
 		if (IS_ERR(map->menu_info)) {
 			ret = PTR_ERR(map->menu_info);
-			goto done;
+			goto free_map;
 		}
 
 		map->menu_count = xmap->menu_count;
@@ -83,13 +83,13 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
 		uvc_trace(UVC_TRACE_CONTROL, "Unsupported V4L2 control type "
 			  "%u.\n", xmap->v4l2_type);
 		ret = -ENOTTY;
-		goto done;
+		goto free_map;
 	}
 
 	ret = uvc_ctrl_add_mapping(chain, map);
 
-done:
 	kfree(map->menu_info);
+free_map:
 	kfree(map);
 
 	return ret;

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2016-11-30 14:46 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-25 10:28 [patch] [media] uvcvideo: freeing an error pointer Dan Carpenter
2016-11-25 13:40 ` SF Markus Elfring
2016-11-25 13:57 ` Laurent Pinchart
2016-11-25 14:47   ` walter harms
2016-11-25 16:02     ` Laurent Pinchart
2016-11-25 19:20       ` Dan Carpenter
2016-11-27 16:21         ` Sakari Alius
2016-11-28 13:49           ` Dan Carpenter
2016-11-28 13:54             ` Julia Lawall
2016-11-28 14:49               ` Laurent Pinchart
2016-11-30 12:33                 ` Dan Carpenter
2016-11-30 13:53                   ` Laurent Pinchart
2016-11-30 14:45                     ` Dan Carpenter
2016-11-29  6:48       ` Julia Lawall
2016-11-25 19:08   ` Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).