summaryrefslogtreecommitdiff
path: root/mkfs
diff options
context:
space:
mode:
authorQu Wenruo <wqu@suse.com>2018-02-14 15:50:06 +0800
committerDavid Sterba <dsterba@suse.com>2018-02-14 16:31:19 +0100
commit78c5a90ebf22989b07770de6324cc14a70d72a17 (patch)
tree8e2c7b6535cd982734078c7f82f14819d2f05f5c /mkfs
parent54246115ba343d07651eff05e8bf7d159a897670 (diff)
btrfs-progs: mkfs/rootdir: Fix memory leak in traverse_directory()
The bug is exposed by mkfs test case 009, with D=asan. We are leaking memory of parent_dir_entry->path() which ,except the rootdir, is allocated by strdup(). Before fixing it, unifiy the allocation of parent_dir_entry() to heap allocation. Then fix it by adding "free(parent_dir_entry->path);" in traverse_directory() and error handler. Issue: #92 Signed-off-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'mkfs')
-rw-r--r--mkfs/rootdir.c5
-rw-r--r--mkfs/rootdir.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index 022d1185..e06b65ac 100644
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -453,7 +453,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
ino_t parent_inum, cur_inum;
ino_t highest_inum = 0;
const char *parent_dir_name;
- char real_path[PATH_MAX];
struct btrfs_path path;
struct extent_buffer *leaf;
struct btrfs_key root_dir_key;
@@ -464,7 +463,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
if (!dir_entry)
return -ENOMEM;
dir_entry->dir_name = dir_name;
- dir_entry->path = realpath(dir_name, real_path);
+ dir_entry->path = realpath(dir_name, NULL);
if (!dir_entry->path) {
error("realpath failed for %s: %s", dir_name, strerror(errno));
ret = -1;
@@ -616,6 +615,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
}
free_namelist(files, count);
+ free(parent_dir_entry->path);
free(parent_dir_entry);
index_cnt = 2;
@@ -686,6 +686,7 @@ fail:
dir_entry = list_entry(dir_head.list.next,
struct directory_name_entry, list);
list_del(&dir_entry->list);
+ free(dir_entry->path);
free(dir_entry);
}
out:
diff --git a/mkfs/rootdir.h b/mkfs/rootdir.h
index d0fc2eb5..f06c7dd1 100644
--- a/mkfs/rootdir.h
+++ b/mkfs/rootdir.h
@@ -23,7 +23,7 @@
struct directory_name_entry {
const char *dir_name;
- const char *path;
+ char *path;
ino_t inum;
struct list_head list;
};