f2fs: fix memory leak of percpu counter in fill_super()
authorChao Yu <yuchao0@huawei.com>
Wed, 5 Sep 2018 06:54:02 +0000 (14:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Nov 2019 08:52:13 +0000 (09:52 +0100)
[ 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>
fs/f2fs/super.c

index 9eff18c1f3e4614db5ba31c7ef5db34b5fe2fc0b..e0ac676e0a35c92429b27270bd2433b1de48cbaf 100644 (file)
@@ -1650,8 +1650,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;
 }
 
 /*