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

Commit e6ea187b authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: handle freeing of key data in wep add key 



Modified the code to free the allocated memory, used to store the key in
wilc_add_wep_key_bss_sta() and wilc_add_wep_key_bss_ap().
After work completion notification is received, free the
memory allocated to avoid missing of free in work function.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6a358d5

drivers/staging/wilc1000/host_interface.c

+0 −7
Original line number Diff line number Diff line
@@ -1551,8 +1551,6 @@ static void handle_key(struct work_struct *work) 
			memcpy(&key_buf[2], hif_key->attr.wep.key,

			       hif_key->attr.wep.key_len);



			kfree(hif_key->attr.wep.key);



			wid_list[2].id = (u16)WID_WEP_KEY_VALUE;

			wid_list[2].type = WID_STR;

			wid_list[2].size = hif_key->attr.wep.key_len + 2;
@@ -1573,7 +1571,6 @@ static void handle_key(struct work_struct *work) 
			memcpy(key_buf + 1, &hif_key->attr.wep.key_len, 1);

			memcpy(key_buf + 2, hif_key->attr.wep.key,

			       hif_key->attr.wep.key_len);

			kfree(hif_key->attr.wep.key);



			wid.id = (u16)WID_ADD_WEP_KEY;

			wid.type = WID_STR;
@@ -2629,8 +2626,6 @@ int wilc_add_wep_key_bss_sta(struct wilc_vif *vif, const u8 *key, u8 len, 
		goto free_key;



	wait_for_completion(&msg->work_comp);

	kfree(msg);

	return 0;



free_key:

	kfree(msg->body.key_info.attr.wep.key);
@@ -2674,8 +2669,6 @@ int wilc_add_wep_key_bss_ap(struct wilc_vif *vif, const u8 *key, u8 len, 
		goto free_key;



	wait_for_completion(&msg->work_comp);

	kfree(msg);

	return 0;



free_key:

	kfree(msg->body.key_info.attr.wep.key);