aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc/uvc_driver.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-07-01 00:33:15 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 14:01:58 -0400
commit0b21d55f8904ff3d52262e91867f9eb2c0b472f3 (patch)
tree64e438a2c41d9cf65cb411e5f205236313dc564d /drivers/media/video/uvc/uvc_driver.c
parentfeda79bffc19e5e1e442966853f58c3b9c7bac0b (diff)
V4L/DVB: drivers/media/video/uvc: Use kmemdup
Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvc_driver.c')
-rw-r--r--drivers/media/video/uvc/uvc_driver.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 838b56f097cf..45aac1041862 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -637,14 +637,13 @@ static int uvc_parse_streaming(struct uvc_device *dev,
637 } 637 }
638 streaming->header.bControlSize = n; 638 streaming->header.bControlSize = n;
639 639
640 streaming->header.bmaControls = kmalloc(p*n, GFP_KERNEL); 640 streaming->header.bmaControls = kmemdup(&buffer[size], p * n,
641 GFP_KERNEL);
641 if (streaming->header.bmaControls == NULL) { 642 if (streaming->header.bmaControls == NULL) {
642 ret = -ENOMEM; 643 ret = -ENOMEM;
643 goto error; 644 goto error;
644 } 645 }
645 646
646 memcpy(streaming->header.bmaControls, &buffer[size], p*n);
647
648 buflen -= buffer[0]; 647 buflen -= buffer[0];
649 buffer += buffer[0]; 648 buffer += buffer[0];
650 649