From: Xenia Ragiadakou Date: Mon, 13 May 2013 02:07:15 +0000 (+0300) Subject: wlan-ng: replace calls to kmalloc and memcpy with kmemdup X-Git-Tag: MMI-PSA29.97-13-9~14152^2~778 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57e6d784404f796a3b8d0124210d9608ea20e279;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git wlan-ng: replace calls to kmalloc and memcpy with kmemdup This patch replaces calls to kmalloc that are followed by memcpy with calls to kmemdup. This patch was found using coccicheck with api/memdup.cocci, with memdup.cocci script slightly altered in the following way: @depends on patch@ expression from,to,size,flag; position p != {r1.p,r2.p}; @@ - to = \(kmalloc@p\|kzalloc@p\)(size,flag); + to = kmemdup(from,size,flag); - memcpy(to, from, size); Signed-off-by: Xenia Ragiadakou Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 428a9be25010..76374b220228 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -1122,8 +1122,7 @@ static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev, kfree(hw->scanresults); - hw->scanresults = kmalloc(sizeof(hfa384x_InfFrame_t), GFP_ATOMIC); - memcpy(hw->scanresults, inf, sizeof(hfa384x_InfFrame_t)); + hw->scanresults = kmemdup(inf, sizeof(hfa384x_InfFrame_t), GFP_ATOMIC); if (nbss == 0) nbss = -1;