Skip to content

Commit 4d17e6f

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: fix to avoid f2fs_bug_on() in dec_valid_node_count()
As Yanming reported in bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215897 I have encountered a bug in F2FS file system in kernel v5.17. The kernel should enable CONFIG_KASAN=y and CONFIG_KASAN_INLINE=y. You can reproduce the bug by running the following commands: The kernel message is shown below: kernel BUG at fs/f2fs/f2fs.h:2511! Call Trace: f2fs_remove_inode_page+0x2a2/0x830 f2fs_evict_inode+0x9b7/0x1510 evict+0x282/0x4e0 do_unlinkat+0x33a/0x540 __x64_sys_unlinkat+0x8e/0xd0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae The root cause is: .total_valid_block_count or .total_valid_node_count could fuzzed to zero, then once dec_valid_node_count() was called, it will cause BUG_ON(), this patch fixes to print warning info and set SBI_NEED_FSCK into CP instead of panic. Cc: stable@vger.kernel.org Reported-by: Ming Yan <yanming@tju.edu.cn> Signed-off-by: Chao Yu <chao.yu@oppo.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent a9163b9 commit 4d17e6f

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

fs/f2fs/f2fs.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2605,11 +2605,17 @@ static inline void dec_valid_node_count(struct f2fs_sb_info *sbi,
26052605
{
26062606
spin_lock(&sbi->stat_lock);
26072607

2608-
f2fs_bug_on(sbi, !sbi->total_valid_block_count);
2609-
f2fs_bug_on(sbi, !sbi->total_valid_node_count);
2608+
if (unlikely(!sbi->total_valid_block_count ||
2609+
!sbi->total_valid_node_count)) {
2610+
f2fs_warn(sbi, "dec_valid_node_count: inconsistent block counts, total_valid_block:%u, total_valid_node:%u",
2611+
sbi->total_valid_block_count,
2612+
sbi->total_valid_node_count);
2613+
set_sbi_flag(sbi, SBI_NEED_FSCK);
2614+
} else {
2615+
sbi->total_valid_block_count--;
2616+
sbi->total_valid_node_count--;
2617+
}
26102618

2611-
sbi->total_valid_node_count--;
2612-
sbi->total_valid_block_count--;
26132619
if (sbi->reserved_blocks &&
26142620
sbi->current_reserved_blocks < sbi->reserved_blocks)
26152621
sbi->current_reserved_blocks++;

0 commit comments

Comments
 (0)