drivers/net/wireless/iwmc3200wifi: Use kmemdup
authorJulia Lawall <julia@diku.dk>
Sat, 15 May 2010 21:16:58 +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>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwmc3200wifi/rx.c

index e1184deca55900636257525f1b24e4bf0f20be1c..c02fcedea9fafc5e80375832d9e8bc7c70867317 100644 (file)
@@ -321,14 +321,14 @@ iwm_rx_ticket_node_alloc(struct iwm_priv *iwm, struct iwm_rx_ticket *ticket)
                return ERR_PTR(-ENOMEM);
        }
 
-       ticket_node->ticket = kzalloc(sizeof(struct iwm_rx_ticket), GFP_KERNEL);
+       ticket_node->ticket = kmemdup(ticket, sizeof(struct iwm_rx_ticket),
+                                     GFP_KERNEL);
        if (!ticket_node->ticket) {
                IWM_ERR(iwm, "Couldn't allocate RX ticket\n");
                kfree(ticket_node);
                return ERR_PTR(-ENOMEM);
        }
 
-       memcpy(ticket_node->ticket, ticket, sizeof(struct iwm_rx_ticket));
        INIT_LIST_HEAD(&ticket_node->node);
 
        return ticket_node;