aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Korotkov <korotkov.maxim.s@gmail.com>2023-06-05 09:08:53 +0300
committerJaegeuk Kim <jaegeuk@kernel.org>2023-06-07 09:57:30 -0700
commita0bef78aeefc53bbaaf1a4c1d3b2429beca509a7 (patch)
tree6c6f88270debfec803259728a073727328c3ad6a
parent2eaf825fc460005cf61508e42530b36cbb3bc881 (diff)
downloadf2fs-tools-a0bef78aeefc53bbaaf1a4c1d3b2429beca509a7.tar.gz
fsck.f2fs: fix memleak in f2fs_create()
In error handling cases, exiting a function without releasing memory Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fsck/dir.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/fsck/dir.c b/fsck/dir.c
index 1cec598..a20aa8b 100644
--- a/fsck/dir.c
+++ b/fsck/dir.c
@@ -708,7 +708,8 @@ int f2fs_create(struct f2fs_sb_info *sbi, struct dentry *de)
ret = convert_inline_dentry(sbi, parent, ni.blk_addr);
if (ret) {
MSG(0, "Convert inline dentry for pino=%x failed.\n", de->pino);
- return -1;
+ ret = -1;
+ goto free_parent_dir;
}
ret = f2fs_find_entry(sbi, parent, de);
@@ -717,6 +718,7 @@ int f2fs_create(struct f2fs_sb_info *sbi, struct dentry *de)
de->name, de->pino, ret);
if (de->file_type == F2FS_FT_REG_FILE)
de->ino = 0;
+ ret = 0;
goto free_parent_dir;
}
@@ -732,7 +734,8 @@ int f2fs_create(struct f2fs_sb_info *sbi, struct dentry *de)
if (hardlink_ni.blk_addr == NULL_ADDR) {
MSG(1, "No original inode for hard link to_ino=%x\n",
found_hardlink->to_ino);
- return -1;
+ ret = -1;
+ goto free_child_dir;
}
/* Use previously-recorded inode */
@@ -754,6 +757,7 @@ int f2fs_create(struct f2fs_sb_info *sbi, struct dentry *de)
if (ret) {
MSG(0, "Skip the existing \"%s\" pino=%x ERR=%d\n",
de->name, de->pino, ret);
+ ret = 0;
goto free_child_dir;
}
@@ -808,7 +812,7 @@ free_child_dir:
free(child);
free_parent_dir:
free(parent);
- return 0;
+ return ret;
}
int f2fs_mkdir(struct f2fs_sb_info *sbi, struct dentry *de)