FAILED: patch "[PATCH] f2fs: validate compress cache inode only when enabled" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 5073c66a96a9c23c0c2533ed4ed06e42f9021208
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026070218-taekwondo-skeletal-13d5@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 5073c66a96a9c23c0c2533ed4ed06e42f9021208 Mon Sep 17 00:00:00 2001
From: Wenjie Qi <[email protected]>
Date: Thu, 21 May 2026 11:16:18 +0800
Subject: [PATCH] f2fs: validate compress cache inode only when enabled
F2FS_COMPRESS_INO() uses NM_I(sbi)->max_nid as the synthetic inode number for the compressed page cache inode. That inode only exists when the compress_cache mount option is enabled.
When compress_cache is disabled, max_nid is outside the valid inode range. A corrupted directory entry that points to ino == max_nid should therefore be rejected by f2fs_check_nid_range(). However, is_meta_ino() currently treats F2FS_COMPRESS_INO() as a meta inode unconditionally, so f2fs_iget() bypasses do_read_inode() and its nid range check, and instantiates a fake internal inode instead.
Gate the compressed cache inode case on COMPRESS_CACHE, matching f2fs_init_compress_inode(). With compress_cache disabled, ino == max_nid now follows the normal inode path and is rejected as an out-of-range nid.
fs/f2fs/inode.c +7 -2
@@ -564,8 +564,13 @@ static int do_read_inode(struct inode *inode)static bool is_meta_ino (struct f2fs_sb_info *sbi,unsigned int ino) { -return ino ==F2FS_NODE_INO (sbi) || ino ==F2FS_META_INO (sbi) || - ino ==F2FS_COMPRESS_INO (sbi); +if (ino ==F2FS_NODE_INO (sbi) || ino ==F2FS_META_INO (sbi)) +return true; +#ifdef CONFIG_F2FS_FS_COMPRESSION +if (test_opt (sbi,COMPRESS_CACHE ) && ino ==F2FS_COMPRESS_INO (sbi)) +return true; +#endif +return false; }struct inode *f2fs_iget (struct super_block *sb,unsigned long ino)
Sasha Levin
maintainerPATCH 1/2 f2fs: fix to detect corrupted meta ino
From: Chao Yu <[email protected]>
[ Upstream commit fcc2d8cc96b2f6141bbbe5b1e8953db990794b44 ]
It is possible that ino of dirent or orphan inode is corrupted in a fuzzed image, occasionally, if corrupted ino is equal to meta ino:meta_ino, node_ino or compress_ino, caller of f2fs_iget() from below call paths will get meta inode directly, it's not allowed, let's add sanity check to detect such cases.
case #1
- recover_dentry
- __f2fs_find_entry
- f2fs_iget_retry
case #2
- recover_orphan_inode
- f2fs_iget_retry
Stable-dep-of: 5073c66a96a9 ("f2fs: validate compress cache inode only when enabled")
--- fs/f2fs/inode.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
fs/f2fs/inode.c +16 -5
@@ -496,6 +496,12 @@ static int do_read_inode(struct inode *inode)return 0 ; } +static bool is_meta_ino (struct f2fs_sb_info *sbi,unsigned int ino) +{ +return ino ==F2FS_NODE_INO (sbi) || ino ==F2FS_META_INO (sbi) || + ino ==F2FS_COMPRESS_INO (sbi); +} +struct inode *f2fs_iget (struct super_block *sb,unsigned long ino) {struct f2fs_sb_info *sbi =F2FS_SB (sb);
@@ -507,16 +513,21 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)return ERR_PTR (-ENOMEM );if (!(inode->i_state &I_NEW )) { +if (is_meta_ino (sbi, ino)) { +f2fs_err (sbi,"inaccessible inode: %lu, run fsck to repair" , ino); +set_sbi_flag (sbi,SBI_NEED_FSCK ); + ret = -EFSCORRUPTED ; +trace_f2fs_iget_exit (inode, ret); +iput (inode); +return ERR_PTR (ret); + } +trace_f2fs_iget (inode);return inode; } -if (ino ==F2FS_NODE_INO (sbi) || ino ==F2FS_META_INO (sbi)) - goto make_now; -#ifdef CONFIG_F2FS_FS_COMPRESSION -if (ino ==F2FS_COMPRESS_INO (sbi)) +if (is_meta_ino (sbi, ino)) goto make_now; -#endif ret =do_read_inode (inode);if (ret)
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 f2fs: validate compress cache inode only when enabled
From: Wenjie Qi <[email protected]>
[ Upstream commit 5073c66a96a9c23c0c2533ed4ed06e42f9021208 ]
F2FS_COMPRESS_INO() uses NM_I(sbi)->max_nid as the synthetic inode number for the compressed page cache inode. That inode only exists when the compress_cache mount option is enabled.
When compress_cache is disabled, max_nid is outside the valid inode range. A corrupted directory entry that points to ino == max_nid should therefore be rejected by f2fs_check_nid_range(). However, is_meta_ino() currently treats F2FS_COMPRESS_INO() as a meta inode unconditionally, so f2fs_iget() bypasses do_read_inode() and its nid range check, and instantiates a fake internal inode instead.
Gate the compressed cache inode case on COMPRESS_CACHE, matching f2fs_init_compress_inode(). With compress_cache disabled, ino == max_nid now follows the normal inode path and is rejected as an out-of-range nid.
--- fs/f2fs/inode.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/f2fs/inode.c +7 -2
@@ -498,8 +498,13 @@ static int do_read_inode(struct inode *inode)static bool is_meta_ino (struct f2fs_sb_info *sbi,unsigned int ino) { -return ino ==F2FS_NODE_INO (sbi) || ino ==F2FS_META_INO (sbi) || - ino ==F2FS_COMPRESS_INO (sbi); +if (ino ==F2FS_NODE_INO (sbi) || ino ==F2FS_META_INO (sbi)) +return true; +#ifdef CONFIG_F2FS_FS_COMPRESSION +if (test_opt (sbi,COMPRESS_CACHE ) && ino ==F2FS_COMPRESS_INO (sbi)) +return true; +#endif +return false; }struct inode *f2fs_iget (struct super_block *sb,unsigned long ino)
Signature · 1 line
2.53.0