V4L/DVB: drivers/media/video/uvc: Use kmemdup
authorJulia Lawall <julia@diku.dk>
Thu, 1 Jul 2010 04:33:15 +0000 (01:33 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 2 Aug 2010 18:01:58 +0000 (15:01 -0300)
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>
drivers/media/video/uvc/uvc_driver.c

index 838b56f097cf816f9221f97a63fd468f49e7bdac..45aac10418621b2eeab700b9f3dd8d11df92def8 100644 (file)
@@ -637,14 +637,13 @@ static int uvc_parse_streaming(struct uvc_device *dev,
        }
        streaming->header.bControlSize = n;
 
-       streaming->header.bmaControls = kmalloc(p*n, GFP_KERNEL);
+       streaming->header.bmaControls = kmemdup(&buffer[size], p * n,
+                                               GFP_KERNEL);
        if (streaming->header.bmaControls == NULL) {
                ret = -ENOMEM;
                goto error;
        }
 
-       memcpy(streaming->header.bmaControls, &buffer[size], p*n);
-
        buflen -= buffer[0];
        buffer += buffer[0];