Commit 1a271d99 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: use kmemdup instead of kmalloc/memcpy 



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: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d317818b

drivers/staging/wilc1000/host_interface.c

+8 −4
Original line number Diff line number Diff line
@@ -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) {