mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 19:59:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: use kmemdup instead of kmalloc and memcpy

Browse Source 
This patch changes kmalloc/memcpy to kmemdup.
It is also added error checking to return -ENOMEM if kmemdup is failed.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim
2015-12-24 16:52:32 +09:00
committed by Greg Kroah-Hartman
parent f382b37606
commit 11623136ef
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/wilc1000/host_interface.c
View File

@@ -3398,20 +3398,23 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
msg.vif = vif;
if (bssid) {
msg.body.con_info.bssid = kmalloc(6, GFP_KERNEL);
memcpy(msg.body.con_info.bssid, bssid, 6);
msg.body.con_info.bssid = kmemdup(bssid, 6, GFP_KERNEL);
if (!msg.body.con_info.bssid)
return -ENOMEM;
}
if (ssid) {
msg.body.con_info.ssid_len = ssid_len;
msg.body.con_info.ssid = kmalloc(ssid_len, GFP_KERNEL);
memcpy(msg.body.con_info.ssid, ssid, ssid_len);
msg.body.con_info.ssid = kmemdup(ssid, ssid_len, GFP_KERNEL);
if (!msg.body.con_info.ssid)
return -ENOMEM;
}
if (ies) {
msg.body.con_info.ies_len = ies_len;
msg.body.con_info.ies = kmalloc(ies_len, GFP_KERNEL);
memcpy(msg.body.con_info.ies, ies, ies_len);
msg.body.con_info.ies = kmemdup(ies, ies_len, GFP_KERNEL);
if (!msg.body.con_info.ies)
return -ENOMEM;
}
if (hif_drv->hif_state < HOST_IF_CONNECTING)
hif_drv->hif_state = HOST_IF_CONNECTING;