btrfs-progs: mkfs/rootdir: Fix memory leak in traverse_directory()
PATCH 1/1 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.
--- mkfs/rootdir.c | 5 +++-- mkfs/rootdir.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
mkfs/rootdir.c +3 -2
@@ -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:
mkfs/rootdir.h +1 -1
@@ -23,7 +23,7 @@struct directory_name_entry {const char *dir_name; -const char *path; +char *path;ino_t inum;struct list_head list; };
Signature · 1 line
2.16.1
David Sterba
AppliedQuoted 5 lines · Qu Wenruo
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 bystrdup().
Quoted 7 lines
Before fixing it, unifiy the allocation of
parent_dir_entry()to heap allocation.Then fix it by adding "
free(parent_dir_entry->path);" intraverse_directory()and error handler.Signed-off-by Qu Wenruo <[email protected]>
Applied, thanks.