Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a61aac7c authored by Julia Lawall's avatar Julia Lawall Committed by John W. Linville
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a465a2cc

drivers/net/wireless/b43/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -1221,14 +1221,14 @@ static int dma_tx_fragment(struct b43_dmaring *ring, 
	meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);

	/* create a bounce buffer in zone_dma on mapping failure. */

	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) {

			ring->current_slot = old_top_slot;

			ring->used_slots = old_used_slots;

			err = -ENOMEM;

			goto out_unmap_hdr;

		}

		memcpy(priv_info->bouncebuffer, skb->data, skb->len);



		meta->dmaaddr = map_descbuffer(ring, priv_info->bouncebuffer, skb->len, 1);

		if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {