drivers/net/wireless/libertas_tf: Use kmemdup
authorJulia Lawall <julia@diku.dk>
Sat, 15 May 2010 21:16:03 +0000 (23:16 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Jun 2010 20:13:10 +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/libertas_tf/if_usb.c

index c445500ffc61b95e1e5834aaab6c8a8f2a4e7df6..b172f5d87a3b4e279bced500cc9c81942e8aaaf5 100644 (file)
@@ -538,7 +538,8 @@ static void if_usb_receive_fwload(struct urb *urb)
                return;
        }
 
-       syncfwheader = kmalloc(sizeof(struct fwsyncheader), GFP_ATOMIC);
+       syncfwheader = kmemdup(skb->data, sizeof(struct fwsyncheader),
+                              GFP_ATOMIC);
        if (!syncfwheader) {
                lbtf_deb_usbd(&cardp->udev->dev, "Failure to allocate syncfwheader\n");
                kfree_skb(skb);
@@ -546,8 +547,6 @@ static void if_usb_receive_fwload(struct urb *urb)
                return;
        }
 
-       memcpy(syncfwheader, skb->data, sizeof(struct fwsyncheader));
-
        if (!syncfwheader->cmd) {
                lbtf_deb_usb2(&cardp->udev->dev, "FW received Blk with correct CRC\n");
                lbtf_deb_usb2(&cardp->udev->dev, "FW received Blk seqnum = %d\n",