4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ben Hutchings <ben.hutchings@xxxxxxxxxxxxxxx> This was done as part of commits 5d64600d4f33 "f2fs: avoid bug_on on corrupted inode" and 76d56d4ab4f2 "f2fs: fix to do sanity check with extra_attr feature" upstream, but the specific checks they added are not applicable to 4.9. Cc: Jaegeuk Kim <jaegeuk@xxxxxxxxxx> Cc: Chao Yu <yuchao0@xxxxxxxxxx> Signed-off-by: Ben Hutchings <ben.hutchings@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/f2fs/inode.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -104,6 +104,13 @@ static void __recover_inline_status(stru return; } +static bool sanity_check_inode(struct inode *inode) +{ + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + + return true; +} + static int do_read_inode(struct inode *inode) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); @@ -153,6 +160,11 @@ static int do_read_inode(struct inode *i get_inline_info(inode, ri); + if (!sanity_check_inode(inode)) { + f2fs_put_page(node_page, 1); + return -EINVAL; + } + /* check data exist */ if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode)) __recover_inline_status(inode, node_page);