]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drivers/net/wireless/orinoco: Use kmemdup
authorJulia Lawall <julia@diku.dk>
Sat, 15 May 2010 21:24:07 +0000 (23:24 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Jun 2010 20:13:13 +0000 (16:13 -0400)
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: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/orinoco/wext.c

index 5775124e2aeefd57215324cb1c778ad983f8b024..a63108c6df7d9cd6586312b24b8a176ece7a1cc8 100644 (file)
@@ -993,11 +993,9 @@ static int orinoco_ioctl_set_genie(struct net_device *dev,
                return -EINVAL;
 
        if (wrqu->data.length) {
-               buf = kmalloc(wrqu->data.length, GFP_KERNEL);
+               buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL);
                if (buf == NULL)
                        return -ENOMEM;
-
-               memcpy(buf, extra, wrqu->data.length);
        } else
                buf = NULL;