Skip to content

Commit

Permalink
drivers/net/wireless/wl12xx: Use kmemdup
Browse files Browse the repository at this point in the history
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: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Julia Lawall authored and John W. Linville committed Jun 2, 2010
1 parent 731a9b2 commit 80caf60
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/net/wireless/wl12xx/wl1251_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,14 @@ static int wl1251_fetch_nvs(struct wl1251 *wl)
}

wl->nvs_len = fw->size;
wl->nvs = kmalloc(wl->nvs_len, GFP_KERNEL);
wl->nvs = kmemdup(fw->data, wl->nvs_len, GFP_KERNEL);

if (!wl->nvs) {
wl1251_error("could not allocate memory for the nvs file");
ret = -ENOMEM;
goto out;
}

memcpy(wl->nvs, fw->data, wl->nvs_len);

ret = 0;

out:
Expand Down

0 comments on commit 80caf60

Please sign in to comment.