f2fs: fix to do sanity check on node footer in __write_node_folio()
Chao Yu
maintainerPATCH v5 1/3 f2fs: fix to do sanity check on node footer in __write_node_folio()
Add node footer sanity check during node folio's writeback, if sanity check fails, let's shutdown filesystem to avoid looping to redirty and writeback in .writepages.
---
v5:
- split original [patch 1/2] to two, in this patch, just use sanity_check_node_footer() to do sanity check during writeback.
fs/f2fs/node.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/f2fs/node.c +5 -1
@@ -1763,7 +1763,11 @@ static bool __write_node_folio(struct folio *folio, bool atomic, bool *submitted/* get old block addr of this node page */ nid =nid_of_node (folio); -f2fs_bug_on (sbi, folio->index != nid); + +if (sanity_check_node_footer (sbi, folio, nid,NODE_TYPE_REGULAR )) { +f2fs_handle_critical_error (sbi,STOP_CP_REASON_CORRUPTED_NID ); + goto redirty_out; + }if (f2fs_get_node_info (sbi, nid, &ni, !do_balance)) goto redirty_out;
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH v5 2/3 f2fs: fix to do sanity check on node footer in {read,write}_end_io
-----------[ cut here ]------------
kernel BUG at fs/f2fs/data.c:358!
Call Trace: <IRQ> blk_update_request+0x5eb/0xe70 block/blk-mq.c:987 blk_mq_end_request+0x3e/0x70 block/blk-mq.c:1149 blk_complete_reqs block/blk-mq.c:1224 [inline] blk_done_softirq+0x107/0x160 block/blk-mq.c:1229 handle_softirqs+0x283/0x870 kernel/softirq.c:579 __do_softirq kernel/softirq.c:613 [inline] invoke_softirq kernel/softirq.c:453 [inline] __irq_exit_rcu+0xca/0x1f0 kernel/softirq.c:680 irq_exit_rcu+0x9/0x30 kernel/softirq.c:696 instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1050 [inline] sysvec_apic_timer_interrupt+0xa6/0xc0 arch/x86/kernel/apic/apic.c:1050 </IRQ>
In f2fs_write_end_io(), it detects there is inconsistency in between node page index (nid) and footer.nid of node page.
If footer of node page is corrupted in fuzzed image, then we load corrupted node page w/ async method, e.g. f2fs_ra_node_pages() or f2fs_ra_node_page(), in where we won't do sanity check on node footer, once node page becomes dirty, we will encounter this bug after node page writeback.
---
v5:
- rebase code to last dev-test branch.
fs/f2fs/data.c | 12 ++++++++++-- fs/f2fs/f2fs.h | 11 +++++++++++ fs/f2fs/node.c | 20 +++++++++++--------- fs/f2fs/node.h | 8 -------- 4 files changed, 32 insertions(+), 19 deletions(-)
fs/f2fs/data.c +10 -2
@@ -172,6 +172,11 @@ static void f2fs_finish_read_bio(struct bio *bio, bool in_task)while (nr_pages--)dec_page_count (F2FS_F_SB (folio),__read_io_type (folio)); +if (F2FS_F_SB (folio)->node_inode &&is_node_folio (folio) && +f2fs_sanity_check_node_footer (F2FS_F_SB (folio), + folio, folio->index,NODE_TYPE_REGULAR , true)) + bio->bi_status =BLK_STS_IOERR ; +if (finished)folio_end_read (folio, bio->bi_status ==BLK_STS_OK ); }
@@ -374,8 +379,11 @@ static void f2fs_write_end_io(struct bio *bio) STOP_CP_REASON_WRITE_FAIL); } -f2fs_bug_on (sbi,is_node_folio (folio) && - folio->index !=nid_of_node (folio)); +if (is_node_folio (folio)) { +f2fs_sanity_check_node_footer (sbi, folio, + folio->index,NODE_TYPE_REGULAR , true); +f2fs_bug_on (sbi, folio->index !=nid_of_node (folio)); + }dec_page_count (sbi, type);if (f2fs_in_warm_node_list (sbi, folio))
fs/f2fs/f2fs.h +11 -0
@@ -1568,6 +1568,14 @@ enum f2fs_lookup_mode { LOOKUP_AUTO, }; +/* For node type in __get_node_folio() */ +enum node_type { +NODE_TYPE_REGULAR , +NODE_TYPE_INODE , +NODE_TYPE_XATTR , +NODE_TYPE_NON_INODE , +}; +/* a threshold of maximum elapsed time in critical region to print tracepoint */ #define MAX_LOCK_ELAPSED_TIME 500
@@ -3895,6 +3903,9 @@ struct folio *f2fs_new_node_folio(struct dnode_of_data *dn, unsigned int ofs);void f2fs_ra_node_page (struct f2fs_sb_info *sbi,nid_t nid);struct folio *f2fs_get_node_folio (struct f2fs_sb_info *sbi,pgoff_t nid,enum node_type node_type); +int f2fs_sanity_check_node_footer (struct f2fs_sb_info *sbi, +struct folio *folio,pgoff_t nid, +enum node_type ntype,bool in_irq);struct folio *f2fs_get_inode_folio (struct f2fs_sb_info *sbi,pgoff_t ino);struct folio *f2fs_get_xnode_folio (struct f2fs_sb_info *sbi,pgoff_t xnid);int f2fs_move_node_folio (struct folio *node_folio,int gc_type);
fs/f2fs/node.c +11 -9
@@ -1511,9 +1511,9 @@ void f2fs_ra_node_page(struct f2fs_sb_info *sbi, nid_t nid)f2fs_folio_put (afolio, err ? true : false); } -static int sanity_check_node_footer (struct f2fs_sb_info *sbi, +int f2fs_sanity_check_node_footer (struct f2fs_sb_info *sbi,struct folio *folio,pgoff_t nid, -enum node_type ntype) +enum node_type ntype,bool in_irq) {if (unlikely (nid !=nid_of_node (folio))) goto out_err;
@@ -1538,12 +1538,13 @@ static int sanity_check_node_footer(struct f2fs_sb_info *sbi, goto out_err;return 0 ; out_err: -f2fs_warn (sbi,"inconsistent node block, node_type:%d, nid:%lu, " -"node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]" , - ntype, nid,nid_of_node (folio),ino_of_node (folio), -ofs_of_node (folio),cpver_of_node (folio), -next_blkaddr_of_node (folio));set_sbi_flag (sbi,SBI_NEED_FSCK ); +f2fs_warn_ratelimited (sbi,"inconsistent node block, node_type:%d, nid:%lu, " +"node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]" , + ntype, nid,nid_of_node (folio),ino_of_node (folio), +ofs_of_node (folio),cpver_of_node (folio), +next_blkaddr_of_node (folio)); +f2fs_handle_error (sbi,ERROR_INCONSISTENT_FOOTER );return -EFSCORRUPTED ; }
@@ -1589,7 +1590,7 @@ static struct folio *__get_node_folio(struct f2fs_sb_info *sbi, pgoff_t nid, goto out_err; } page_hit: - err =sanity_check_node_footer (sbi, folio, nid, ntype); + err =f2fs_sanity_check_node_footer (sbi, folio, nid, ntype, false);if (!err)return folio; out_err:
@@ -1764,7 +1765,8 @@ static bool __write_node_folio(struct folio *folio, bool atomic, bool *submitted/* get old block addr of this node page */ nid =nid_of_node (folio); -if (sanity_check_node_footer (sbi, folio, nid,NODE_TYPE_REGULAR )) { +if (f2fs_sanity_check_node_footer (sbi, folio, nid, +NODE_TYPE_REGULAR , false)) {f2fs_handle_critical_error (sbi,STOP_CP_REASON_CORRUPTED_NID ); goto redirty_out; }
fs/f2fs/node.h +0 -8
@@ -52,14 +52,6 @@ enum { IS_PREALLOC, /* nat entry is preallocated */ }; -/* For node type in __get_node_folio() */ -enum node_type { -NODE_TYPE_REGULAR , -NODE_TYPE_INODE , -NODE_TYPE_XATTR , -NODE_TYPE_NON_INODE , -}; -/* * For node information */
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH v5 3/3 f2fs: detect more inconsistent cases in sanity_check_node_footer()
In reply to Chao YuLet's enhance sanity_check_node_footer() to detect more inconsistent cases as below:
Node Type Node Footer Info
=================== =============================NODE_TYPE_REGULAR inode = true and xnode = trueNODE_TYPE_INODE inode = false or xnode = trueNODE_TYPE_XATTR inode = true or xnode = falseNODE_TYPE_NON_INODE inode = false
---
v5:
- split original patch 1/2 to two, in this patch, fix to not sanity check on uninitialized i_mode for new inode page, instead, let's enhance sanity_check_node_footer() to detect more inconsistent cases in node footer.
fs/f2fs/node.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
fs/f2fs/node.c +12 -3
@@ -1515,20 +1515,29 @@ int f2fs_sanity_check_node_footer(struct f2fs_sb_info *sbi, struct folio *folio, pgoff_t nid, enum node_type ntype, bool in_irq) { + bool is_inode, is_xnode; +if (unlikely (nid !=nid_of_node (folio))) goto out_err; + is_inode =IS_INODE (folio); + is_xnode =f2fs_has_xattr_block (ofs_of_node (folio)); +switch (ntype) { +case NODE_TYPE_REGULAR : +if (is_inode && is_xnode) + goto out_err; +break ;case NODE_TYPE_INODE : -if (!IS_INODE (folio)) +if (!is_inode || is_xnode) goto out_err;break ;case NODE_TYPE_XATTR : -if (!f2fs_has_xattr_block (ofs_of_node (folio))) +if (is_inode || !is_xnode) goto out_err;break ;case NODE_TYPE_NON_INODE : -if (IS_INODE (folio)) +if (is_inode) goto out_err;break ;default :
Signature · 1 line
2.40.1
This series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 11 lines · On Mon, 12 Jan 2026 15:49:15 +0800 you wrote:
Add node footer sanity check during node folio's writeback, if sanity check fails, let's shutdown filesystem to avoid looping to redirty and writeback in .writepages.
Signed-off-by Chao Yu <[email protected]>---
v5:
- split original [patch 1/2] to two, in this patch, just usesanity_check_node_footer()to do sanity check during writeback.fs/f2fs/node.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Here is the summary with links:
- [f2fs-dev,v5,1/3] f2fs: fix to do sanity check on node footer in __write_node_folio()
https://git.kernel.org/jaegeuk/f2fs/c/0a736109c9d2 - [f2fs-dev,v5,2/3] f2fs: fix to do sanity check on node footer in {read, write}_end_io (no matching commit) - [f2fs-dev,v5,3/3] f2fs: detect more inconsistent cases in sanity_check_node_footer() https://git.kernel.org/jaegeuk/f2fs/c/93ffb6c28ff1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html