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

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

staging: wilc1000: free memory allocated in add wep key functions 



Free memory allocated for wep key when command enqueue is failed.

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 7ab3e668

drivers/staging/wilc1000/host_interface.c

+14 −10
Original line number Diff line number Diff line
@@ -2716,7 +2716,7 @@ int wilc_set_wep_default_keyid(struct wilc_vif *vif, u8 index) 
int wilc_add_wep_key_bss_sta(struct wilc_vif *vif, const u8 *key, u8 len,

			     u8 index)

{

	int result = 0;

	int result;

	struct host_if_msg msg;

	struct host_if_drv *hif_drv = vif->hif_drv;
@@ -2739,17 +2739,20 @@ int wilc_add_wep_key_bss_sta(struct wilc_vif *vif, const u8 *key, u8 len, 
	msg.body.key_info.attr.wep.index = index;



	result = wilc_enqueue_cmd(&msg);

	if (result)

	if (result) {

		netdev_err(vif->ndev, "STA - WEP Key\n");

	wait_for_completion(&hif_drv->comp_test_key_block);



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

		return result;

	}



	wait_for_completion(&hif_drv->comp_test_key_block);

	return 0;

}



int wilc_add_wep_key_bss_ap(struct wilc_vif *vif, const u8 *key, u8 len,

			    u8 index, u8 mode, enum AUTHTYPE auth_type)

{

	int result = 0;

	int result;

	struct host_if_msg msg;

	struct host_if_drv *hif_drv = vif->hif_drv;
@@ -2774,15 +2777,16 @@ int wilc_add_wep_key_bss_ap(struct wilc_vif *vif, const u8 *key, u8 len, 
	msg.body.key_info.attr.wep.auth_type = auth_type;



	result = wilc_enqueue_cmd(&msg);



	if (result)

	if (result) {

		netdev_err(vif->ndev, "AP - WEP Key\n");

	else

		wait_for_completion(&hif_drv->comp_test_key_block);



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

		return result;

	}



	wait_for_completion(&hif_drv->comp_test_key_block);

	return 0;

}



int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len,

		 const u8 *mac_addr, const u8 *rx_mic, const u8 *tx_mic,

		 u8 mode, u8 cipher_mode, u8 index)