staging: wilc1000: free allocated memory in wilc_add_rx_gtk()
authorAjay Singh <ajay.kathat@microchip.com>
Mon, 26 Mar 2018 11:46:01 +0000 (17:16 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Mar 2018 11:38:47 +0000 (13:38 +0200)
Free memory allocated in wilc_add_rx_gtk() before returing from the
function.

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 3e1c5d347a4f65d76e42b4029a2253923e2fdffe..b82110b04693162221b3eef4e6d007cdf0ff48d9 100644 (file)
@@ -2853,7 +2853,7 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,
                    const u8 *rx_mic, const u8 *tx_mic, u8 mode,
                    u8 cipher_mode)
 {
-       int result = 0;
+       int result;
        struct host_if_msg msg;
        struct host_if_drv *hif_drv = vif->hif_drv;
        u8 key_len = gtk_key_len;
@@ -2892,8 +2892,10 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,
        msg.body.key_info.attr.wpa.key = kmemdup(rx_gtk,
                                                 key_len,
                                                 GFP_KERNEL);
-       if (!msg.body.key_info.attr.wpa.key)
+       if (!msg.body.key_info.attr.wpa.key) {
+               kfree(msg.body.key_info.attr.wpa.seq);
                return -ENOMEM;
+       }
 
        if (rx_mic)
                memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic,
@@ -2908,12 +2910,15 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,
        msg.body.key_info.attr.wpa.seq_len = key_rsc_len;
 
        result = wilc_enqueue_cmd(&msg);
-       if (result)
+       if (result) {
                netdev_err(vif->ndev, "RX GTK\n");
-       else
-               wait_for_completion(&hif_drv->comp_test_key_block);
+               kfree(msg.body.key_info.attr.wpa.seq);
+               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_set_pmkid_info(struct wilc_vif *vif,