staging: wilc1000: free memory allocated in add wep key functions
authorAjay Singh <ajay.kathat@microchip.com>
Mon, 26 Mar 2018 11:45:58 +0000 (17:15 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Mar 2018 11:38:46 +0000 (13:38 +0200)
Free memory allocated for wep key when command enqueue is failed.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c

index 89972e86c7090ded1f9fef62321d93fc9152ed8f..b710b6f6866a48e91d682c64e92f048e8b079dca 100644 (file)
@@ -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;
+       }
 
-       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,13 +2777,14 @@ 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;
+       }
 
-       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,