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

Commit 80caf601 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>
Acked-by: default avatarKalle Valo <kvalo@adurom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 731a9b2a

drivers/net/wireless/wl12xx/wl1251_main.c

+1 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 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");
@@ -132,8 +132,6 @@ static int wl1251_fetch_nvs(struct wl1251 *wl) 
		goto out;

	}



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



	ret = 0;



out: