[PATCH v2 7/9] staging: wilc1000: free allocated memory in wilc_add_rx_gtk()

[Ajay Singh]

Free memory allocated in wilc_add_rx_gtk() before returing from the
function.

Signed-off-by: Ajay Singh <ajay.kat...@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.bez...@microchip.com>
---
 drivers/staging/wilc1000/host_interface.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c 
b/drivers/staging/wilc1000/host_interface.c
index e58fa87..d2efec2 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2841,7 +2841,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;
@@ -2880,8 +2880,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,
@@ -2896,12 +2898,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,
-- 
2.7.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel