diff mbox

[11/13] staging: wilc1000: use kmemdup instead of kmalloc/memcpy

Message ID 1452002817-30937-11-git-send-email-chaehyun.lim@gmail.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Chaehyun Lim Jan. 5, 2016, 2:06 p.m. UTC 
This patch replaces kmalloc followed by memcpy with kmemdup.
It is also added error checking to return -ENOMEM when kmemdup is
failed.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/host_interface.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 85aae56..8d022a0 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3704,12 +3704,16 @@  int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
 	msg.body.scan_info.arg = user_arg;
 
 	msg.body.scan_info.ch_list_len = ch_list_len;
-	msg.body.scan_info.ch_freq_list = kmalloc(ch_list_len, GFP_KERNEL);
-	memcpy(msg.body.scan_info.ch_freq_list, ch_freq_list, ch_list_len);
+	msg.body.scan_info.ch_freq_list = kmemdup(ch_freq_list,
+						  ch_list_len,
+						  GFP_KERNEL);
+	if (!msg.body.scan_info.ch_freq_list)
+		return -ENOMEM;
 
 	msg.body.scan_info.ies_len = ies_len;
-	msg.body.scan_info.ies = kmalloc(ies_len, GFP_KERNEL);
-	memcpy(msg.body.scan_info.ies, ies, ies_len);
+	msg.body.scan_info.ies = kmemdup(ies, ies_len, GFP_KERNEL);
+	if (!msg.body.scan_info.ies)
+		return -ENOMEM;
 
 	result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
 	if (result) {