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

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

drivers/net/wireless/wl12xx: 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 3289a836

drivers/net/wireless/wl12xx/wl1271_main.c

+2 −6
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ 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");
@@ -584,8 +584,6 @@ static int wl1271_fetch_nvs(struct wl1271 *wl) 
		goto out;

	}



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



out:

	release_firmware(fw);
@@ -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));