summaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorChao Yu <yuchao0@huawei.com>2018-09-05 14:54:02 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-20 17:59:52 +0100
commit2afdbe702024508ef0286ff3240660c3b7164d47 (patch)
tree9941e33fa822c1ad99dfb7aaa6ea9bc8bcc97ee0 /fs/f2fs
parentb7da2be19178ba02912b1a3c7e46b6ab4f050f92 (diff)
downloadlinux-stable-2afdbe702024508ef0286ff3240660c3b7164d47.tar.gz
linux-stable-2afdbe702024508ef0286ff3240660c3b7164d47.tar.bz2
linux-stable-2afdbe702024508ef0286ff3240660c3b7164d47.zip
f2fs: fix memory leak of percpu counter in fill_super()
[ Upstream commit 4a70e255449c9a13eed7a6eeecc85a1ea63cef76 ] In fill_super -> init_percpu_info, we should destroy percpu counter in error path, otherwise memory allcoated for percpu counter will leak. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/super.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 0f3209b23c94..e4aabfc21bd4 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2123,8 +2123,12 @@ static int init_percpu_info(struct f2fs_sb_info *sbi)
if (err)
return err;
- return percpu_counter_init(&sbi->total_valid_inode_count, 0,
+ err = percpu_counter_init(&sbi->total_valid_inode_count, 0,
GFP_KERNEL);
+ if (err)
+ percpu_counter_destroy(&sbi->alloc_valid_block_count);
+
+ return err;
}
#ifdef CONFIG_BLK_DEV_ZONED