[PATCH v2 2/2] btrfs-progs: Fix up memory leakage

[Zhi Yong Wu]

  Some code pathes forget to free memory on exit.

Changelog from v1:
  Fix the variable is used uncorrectly. [Ram Pai]

Signed-off-by: Zhi Yong Wu <wu...@linux.vnet.ibm.com>
---
 cmds-filesystem.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index e62c4fd..9c43d35 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -47,7 +47,7 @@ static const char * const cmd_df_usage[] = {
 
 static int cmd_df(int argc, char **argv)
 {
-       struct btrfs_ioctl_space_args *sargs;
+       struct btrfs_ioctl_space_args *sargs, *sargs_orig;
        u64 count = 0, i;
        int ret;
        int fd;
@@ -65,7 +65,7 @@ static int cmd_df(int argc, char **argv)
                return 12;
        }
 
-       sargs = malloc(sizeof(struct btrfs_ioctl_space_args));
+       sargs_orig = sargs = malloc(sizeof(struct btrfs_ioctl_space_args));
        if (!sargs)
                return -ENOMEM;
 
@@ -83,6 +83,7 @@ static int cmd_df(int argc, char **argv)
        }
        if (!sargs->total_spaces) {
                close(fd);
+               free(sargs);
                return 0;
        }
 
@@ -92,6 +93,7 @@ static int cmd_df(int argc, char **argv)
                        (count * sizeof(struct btrfs_ioctl_space_info)));
        if (!sargs) {
                close(fd);
+               free(sargs_orig);
                return -ENOMEM;
        }
 
-- 
1.7.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/