]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
staging: wilc1000: fix to free allocated memory in wilc_add_ptk()
authorAjay Singh <ajay.kathat@microchip.com>
Mon, 26 Mar 2018 11:46:00 +0000 (17:16 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Mar 2018 11:38:47 +0000 (13:38 +0200)
Free allocated memory in wilc_add_ptk() when it fails to enqueue the
command.

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 da53fec4659068a06256c8a31450e93c38109346..3e1c5d347a4f65d76e42b4029a2253923e2fdffe 100644 (file)
@@ -2793,7 +2793,7 @@ 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)
 {
-       int result = 0;
+       int result;
        struct host_if_msg msg;
        struct host_if_drv *hif_drv = vif->hif_drv;
        u8 key_len = ptk_key_len;
@@ -2838,13 +2838,14 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len,
        msg.vif = vif;
 
        result = wilc_enqueue_cmd(&msg);
-
-       if (result)
+       if (result) {
                netdev_err(vif->ndev, "PTK Key\n");
-       else
-               wait_for_completion(&hif_drv->comp_test_key_block);
+               kfree(msg.body.key_info.attr.wpa.key);
+               return result;
+       }
 
-       return result;
+       wait_for_completion(&hif_drv->comp_test_key_block);
+       return 0;
 }
 
 int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,