Fix memory leaks in various error flows

Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/src/cmd.c b/src/cmd.c
index 39af833b3abace439b70d581c8dc211befdce05a..1a042285e939b166528b1b67bd45ce5738c9fdb3 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -68,8 +68,10 @@ static int ibv_cmd_get_context_v2(struct ibv_context *context,
        IBV_INIT_CMD_RESP(cmd, cmd_size, GET_CONTEXT, resp, resp_size);
        cmd->cq_fd_tab = (uintptr_t) &cq_fd;
 
-       if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
+       if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) {
+               free(t);
                return errno;
+       }
 
        VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
 

diff --git a/src/compat-1_0.c b/src/compat-1_0.c
index 3f5ff35ef88139d71d2b38eb074d251b1f838d00..fff6412260121eeeb0f2ff3edc39b6cb8570949b 100644 (file)
--- a/src/compat-1_0.c
+++ b/src/compat-1_0.c
@@ -238,7 +238,7 @@ struct ibv_device_1_0 **__ibv_get_device_list_1_0(int *num)
 
        l = calloc(n + 2, sizeof (struct ibv_device_1_0 *));
        if (!l)
-               return NULL;
+               goto free_device_list;
 
        l[0] = (void *) real_list;
 
@@ -258,6 +258,9 @@ fail:
        for (i = 1; i <= n; ++i)
                if (l[i])
                        free(l[i]);
+       free(l);
+
+free_device_list:
        ibv_free_device_list(real_list);
        return NULL;
 }

diff --git a/src/init.c b/src/init.c
index 06e550d1db3cdebdf81606e1e619541a42908c16..8d6786e509cb578d684388fb23de7117dc4487ec 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -309,7 +309,7 @@ static void read_config(void)
                if (asprintf(&path, "%s/%s", IBV_CONFIG_DIR, dent->d_name) < 0) {
                        fprintf(stderr, PFX "Warning: couldn't read config file %s/%s.\n",
                                IBV_CONFIG_DIR, dent->d_name);
-                       return;
+                       goto out;
                }
 
                if (stat(path, &buf)) {
@@ -326,6 +326,7 @@ next:
                free(path);
        }
 
+out:
        closedir(conf_dir);
 }