diff mbox

Btrfs-progs: Add missing free() against fs_info->super_copy

Message ID 1369489792-5673-2-git-send-email-fdmanana@gmail.com (mailing list archive)
State Under Review, archived
Headers show

Commit Message

Filipe Manana May 25, 2013, 1:49 p.m. UTC 
There was a missing free() call against fs_info->super_copy
in several places:

1) close_ctree()

2) open_ctree_broken() on failure

3) __open_ctree_fd() on failure

Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
 btrfs-find-root.c |    4 ++--
 disk-io.c         |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index 810d835..5616e5c 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -94,7 +94,7 @@  static struct btrfs_root *open_ctree_broken(int fd, const char *device)
 	struct btrfs_root *chunk_root = malloc(sizeof(struct btrfs_root));
 	struct btrfs_root *dev_root = malloc(sizeof(struct btrfs_root));
 	struct btrfs_root *csum_root = malloc(sizeof(struct btrfs_root));
-	struct btrfs_fs_info *fs_info = malloc(sizeof(*fs_info));
+	struct btrfs_fs_info *fs_info = calloc(1, sizeof(*fs_info));
 	int ret;
 	struct btrfs_super_block *disk_super;
 	struct btrfs_fs_devices *fs_devices = NULL;
@@ -115,7 +115,6 @@  static struct btrfs_root *open_ctree_broken(int fd, const char *device)
 			goto out;
 	}
 
-	memset(fs_info, 0, sizeof(*fs_info));
 	fs_info->super_copy = calloc(1, BTRFS_SUPER_INFO_SIZE);
 	fs_info->tree_root = tree_root;
 	fs_info->extent_root = extent_root;
@@ -228,6 +227,7 @@  out:
 	free(chunk_root);
 	free(dev_root);
 	free(csum_root);
+	free(fs_info->super_copy);
 	free(fs_info);
 	return NULL;
 }
diff --git a/disk-io.c b/disk-io.c
index 21b410d..3b9b3ed 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -812,7 +812,7 @@  static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
 	struct btrfs_root *chunk_root = malloc(sizeof(struct btrfs_root));
 	struct btrfs_root *dev_root = malloc(sizeof(struct btrfs_root));
 	struct btrfs_root *csum_root = malloc(sizeof(struct btrfs_root));
-	struct btrfs_fs_info *fs_info = malloc(sizeof(*fs_info));
+	struct btrfs_fs_info *fs_info = calloc(1, sizeof(*fs_info));
 	int ret;
 	struct btrfs_super_block *disk_super;
 	struct btrfs_fs_devices *fs_devices = NULL;
@@ -840,7 +840,6 @@  static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
 			goto out;
 	}
 
-	memset(fs_info, 0, sizeof(*fs_info));
 	fs_info->super_copy = calloc(1, BTRFS_SUPER_INFO_SIZE);
 	fs_info->tree_root = tree_root;
 	fs_info->extent_root = extent_root;
@@ -1039,6 +1038,7 @@  out:
 	free(chunk_root);
 	free(dev_root);
 	free(csum_root);
+	free(fs_info->super_copy);
 	free(fs_info);
 	return NULL;
 }
@@ -1347,6 +1347,7 @@  int close_ctree(struct btrfs_root *root)
 	free(fs_info->chunk_root);
 	free(fs_info->dev_root);
 	free(fs_info->csum_root);
+	free(fs_info->super_copy);
 	free(fs_info);
 
 	return 0;