diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-15 17:12:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-02 16:13:08 -0400 |
commit | 731a9b2a024714a3fa070b014744d02b9a96b3b6 (patch) | |
tree | d7f3fecb9e00bbcc9a1ccc03ec529dbba6d21698 /drivers/net | |
parent | 04236066e00ab20c6745569268d67a980bd06abd (diff) |
drivers/net/wireless/libertas: 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>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index a0cb265e5816..3678e532874f 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
@@ -613,16 +613,14 @@ static void if_usb_receive_fwload(struct urb *urb) | |||
613 | return; | 613 | return; |
614 | } | 614 | } |
615 | 615 | ||
616 | syncfwheader = kmalloc(sizeof(struct fwsyncheader), GFP_ATOMIC); | 616 | syncfwheader = kmemdup(skb->data + IPFIELD_ALIGN_OFFSET, |
617 | sizeof(struct fwsyncheader), GFP_ATOMIC); | ||
617 | if (!syncfwheader) { | 618 | if (!syncfwheader) { |
618 | lbs_deb_usbd(&cardp->udev->dev, "Failure to allocate syncfwheader\n"); | 619 | lbs_deb_usbd(&cardp->udev->dev, "Failure to allocate syncfwheader\n"); |
619 | kfree_skb(skb); | 620 | kfree_skb(skb); |
620 | return; | 621 | return; |
621 | } | 622 | } |
622 | 623 | ||
623 | memcpy(syncfwheader, skb->data + IPFIELD_ALIGN_OFFSET, | ||
624 | sizeof(struct fwsyncheader)); | ||
625 | |||
626 | if (!syncfwheader->cmd) { | 624 | if (!syncfwheader->cmd) { |
627 | lbs_deb_usb2(&cardp->udev->dev, "FW received Blk with correct CRC\n"); | 625 | lbs_deb_usb2(&cardp->udev->dev, "FW received Blk with correct CRC\n"); |
628 | lbs_deb_usb2(&cardp->udev->dev, "FW received Blk seqnum = %d\n", | 626 | lbs_deb_usb2(&cardp->udev->dev, "FW received Blk seqnum = %d\n", |