]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: wilc1000: fix a couple of memory leaks
authorColin Ian King <colin.king@canonical.com>
Mon, 21 Mar 2016 22:42:11 +0000 (22:42 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Mar 2016 02:27:36 +0000 (22:27 -0400)
The ENOMEM error return paths are not free'ing allocated memory
resulting in a memory leak of allocated structures. Perform the
required kfree to fix the memory leaks.

Issue discovered with static analysis using CoverityScan

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/coreconfigurator.c

index 2c4ae1fc8435f00b708a817d2100794bbec8e2b8..4b51c0ac27ac1b7ef27105aa16c379b6d0d42cdc 100644 (file)
@@ -338,8 +338,10 @@ s32 wilc_parse_network_info(u8 *msg_buffer,
 
                if (ies_len > 0) {
                        network_info->ies = kmemdup(ies, ies_len, GFP_KERNEL);
-                       if (!network_info->ies)
+                       if (!network_info->ies) {
+                               kfree(network_info);
                                return -ENOMEM;
+                       }
                }
                network_info->ies_len = ies_len;
        }
@@ -373,8 +375,10 @@ s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
                                            AID_LEN);
 
                connect_resp_info->ies = kmemdup(ies, ies_len, GFP_KERNEL);
-               if (!connect_resp_info->ies)
+               if (!connect_resp_info->ies) {
+                       kfree(connect_resp_info);
                        return -ENOMEM;
+               }
 
                connect_resp_info->ies_len = ies_len;
        }