Browse Source

drivers/net/wireless/b43: 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: John W. Linville <linville@tuxdriver.com>
Julia Lawall 15 years ago
parent
commit
a61aac7cf1
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/net/wireless/b43/dma.c

+ 2 - 2
drivers/net/wireless/b43/dma.c

@@ -1221,14 +1221,14 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
 	meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
 	meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
 	/* create a bounce buffer in zone_dma on mapping failure. */
 	/* create a bounce buffer in zone_dma on mapping failure. */
 	if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
 	if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
-		priv_info->bouncebuffer = kmalloc(skb->len, GFP_ATOMIC | GFP_DMA);
+		priv_info->bouncebuffer = kmemdup(skb->data, skb->len,
+						  GFP_ATOMIC | GFP_DMA);
 		if (!priv_info->bouncebuffer) {
 		if (!priv_info->bouncebuffer) {
 			ring->current_slot = old_top_slot;
 			ring->current_slot = old_top_slot;
 			ring->used_slots = old_used_slots;
 			ring->used_slots = old_used_slots;
 			err = -ENOMEM;
 			err = -ENOMEM;
 			goto out_unmap_hdr;
 			goto out_unmap_hdr;
 		}
 		}
-		memcpy(priv_info->bouncebuffer, skb->data, skb->len);
 
 
 		meta->dmaaddr = map_descbuffer(ring, priv_info->bouncebuffer, skb->len, 1);
 		meta->dmaaddr = map_descbuffer(ring, priv_info->bouncebuffer, skb->len, 1);
 		if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
 		if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {