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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Julia Lawall authored and John W. Linville committed Jul 26, 2010
1 parent 3289a83 commit 929ebd3
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/net/wireless/wl12xx/wl1271_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -576,16 +576,14 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
goto out;
}

wl->nvs = kzalloc(sizeof(struct wl1271_nvs_file), GFP_KERNEL);
wl->nvs = kmemdup(fw->data, sizeof(struct wl1271_nvs_file), GFP_KERNEL);

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

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

out:
release_firmware(fw);

Expand Down Expand Up @@ -2350,15 +2348,13 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
goto err_hw_alloc;
}

plat_dev = kmalloc(sizeof(wl1271_device), GFP_KERNEL);
plat_dev = kmemdup(&wl1271_device, sizeof(wl1271_device), GFP_KERNEL);
if (!plat_dev) {
wl1271_error("could not allocate platform_device");
ret = -ENOMEM;
goto err_plat_alloc;
}

memcpy(plat_dev, &wl1271_device, sizeof(wl1271_device));

wl = hw->priv;
memset(wl, 0, sizeof(*wl));

Expand Down

0 comments on commit 929ebd3

Please sign in to comment.