| Message ID | 20230529102755.2547478-1-chao@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [f2fs-dev] f2fs: do more sanity check on inode | expand |
On 05/29, Chao Yu wrote: > This patch does below changes: > - clean up check condition > - add sanity check for i_extra_isize w/ lower boundary > - add sanity check for feature dependency > - check i_extra_isize only if f2fs_has_extra_attr() is true Could you describe what is the current problem? > > Signed-off-by: Chao Yu <chao@kernel.org> > --- > fs/f2fs/f2fs.h | 2 + > fs/f2fs/inode.c | 108 +++++++++++++++++++++++++++++++----------------- > 2 files changed, 72 insertions(+), 38 deletions(-) > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 9bd83fb28439..11c0bb12c686 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -3424,6 +3424,8 @@ static inline int get_inline_xattr_addrs(struct inode *inode) > ((is_inode_flag_set(i, FI_ACL_MODE)) ? \ > (F2FS_I(i)->i_acl_mode) : ((i)->i_mode)) > > +#define F2FS_MIN_EXTRA_ATTR_SIZE (sizeof(__le32)) > + > #define F2FS_TOTAL_EXTRA_ATTR_SIZE \ > (offsetof(struct f2fs_inode, i_extra_end) - \ > offsetof(struct f2fs_inode, i_extra_isize)) \ > diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c > index 0a1748444329..1e49009831c1 100644 > --- a/fs/f2fs/inode.c > +++ b/fs/f2fs/inode.c > @@ -300,41 +300,79 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) > return false; > } > > - if (f2fs_sb_has_flexible_inline_xattr(sbi) > - && !f2fs_has_extra_attr(inode)) { > - set_sbi_flag(sbi, SBI_NEED_FSCK); > - f2fs_warn(sbi, "%s: corrupted inode ino=%lx, run fsck to fix.", > - __func__, inode->i_ino); > - return false; > - } > - > - if (f2fs_has_extra_attr(inode) && > - !f2fs_sb_has_extra_attr(sbi)) { > - set_sbi_flag(sbi, SBI_NEED_FSCK); > - f2fs_warn(sbi, "%s: inode (ino=%lx) is with extra_attr, but extra_attr feature is off", > - __func__, inode->i_ino); > - return false; > - } > - > - if (fi->i_extra_isize > F2FS_TOTAL_EXTRA_ATTR_SIZE || > + if (f2fs_has_extra_attr(inode)) { > + if (!f2fs_sb_has_extra_attr(sbi)) { > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: inode (ino=%lx) is with extra_attr, but extra_attr feature is off", > + __func__, inode->i_ino); > + return false; > + } > + if (fi->i_extra_isize > F2FS_TOTAL_EXTRA_ATTR_SIZE || > + fi->i_extra_isize < F2FS_MIN_EXTRA_ATTR_SIZE || > fi->i_extra_isize % sizeof(__le32)) { > - set_sbi_flag(sbi, SBI_NEED_FSCK); > - f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_extra_isize: %d, max: %zu", > - __func__, inode->i_ino, fi->i_extra_isize, > - F2FS_TOTAL_EXTRA_ATTR_SIZE); > - return false; > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_extra_isize: %d, max: %zu", > + __func__, inode->i_ino, fi->i_extra_isize, > + F2FS_TOTAL_EXTRA_ATTR_SIZE); > + return false; > + } > + if (f2fs_sb_has_flexible_inline_xattr(sbi) && > + f2fs_has_inline_xattr(inode) && > + (!fi->i_inline_xattr_size || > + fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) { > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, max: %zu", > + __func__, inode->i_ino, fi->i_inline_xattr_size, > + MAX_INLINE_XATTR_SIZE); > + return false; > + } > + if (f2fs_sb_has_compression(sbi) && > + fi->i_flags & F2FS_COMPR_FL && > + F2FS_FITS_IN_INODE(ri, fi->i_extra_isize, > + i_compress_flag)) { > + if (!sanity_check_compress_inode(inode, ri)) > + return false; > + } > + } else { > + if (f2fs_sb_has_flexible_inline_xattr(sbi)) { > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, run fsck to fix.", > + __func__, inode->i_ino); > + return false; > + } > } > > - if (f2fs_has_extra_attr(inode) && > - f2fs_sb_has_flexible_inline_xattr(sbi) && > - f2fs_has_inline_xattr(inode) && > - (!fi->i_inline_xattr_size || > - fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) { > - set_sbi_flag(sbi, SBI_NEED_FSCK); > - f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, max: %zu", > - __func__, inode->i_ino, fi->i_inline_xattr_size, > - MAX_INLINE_XATTR_SIZE); > - return false; > + if (!f2fs_sb_has_extra_attr(sbi)) { > + if (f2fs_sb_has_project_quota(sbi)) { > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", > + __func__, inode->i_ino, F2FS_FEATURE_PRJQUOTA); > + return false; > + } > + if (f2fs_sb_has_inode_chksum(sbi)) { > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", > + __func__, inode->i_ino, F2FS_FEATURE_INODE_CHKSUM); > + return false; > + } > + if (f2fs_sb_has_flexible_inline_xattr(sbi)) { > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", > + __func__, inode->i_ino, F2FS_FEATURE_FLEXIBLE_INLINE_XATTR); > + return false; > + } > + if (f2fs_sb_has_inode_crtime(sbi)) { > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", > + __func__, inode->i_ino, F2FS_FEATURE_INODE_CRTIME); > + return false; > + } > + if (f2fs_sb_has_compression(sbi)) { > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", > + __func__, inode->i_ino, F2FS_FEATURE_COMPRESSION); > + return false; > + } > } > > if (f2fs_sanity_check_inline_data(inode)) { > @@ -358,12 +396,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) > return false; > } > > - if (f2fs_has_extra_attr(inode) && f2fs_sb_has_compression(sbi) && > - fi->i_flags & F2FS_COMPR_FL && > - F2FS_FITS_IN_INODE(ri, fi->i_extra_isize, > - i_compress_flag)) > - return sanity_check_compress_inode(inode, ri); > - > return true; > } > > -- > 2.40.1
On 2023/5/31 7:03, Jaegeuk Kim wrote: > On 05/29, Chao Yu wrote: >> This patch does below changes: >> - clean up check condition >> - add sanity check for i_extra_isize w/ lower boundary >> - add sanity check for feature dependency >> - check i_extra_isize only if f2fs_has_extra_attr() is true > > Could you describe what is the current problem? Updated in v2. Thanks, > >> >> Signed-off-by: Chao Yu <chao@kernel.org> >> --- >> fs/f2fs/f2fs.h | 2 + >> fs/f2fs/inode.c | 108 +++++++++++++++++++++++++++++++----------------- >> 2 files changed, 72 insertions(+), 38 deletions(-) >> >> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h >> index 9bd83fb28439..11c0bb12c686 100644 >> --- a/fs/f2fs/f2fs.h >> +++ b/fs/f2fs/f2fs.h >> @@ -3424,6 +3424,8 @@ static inline int get_inline_xattr_addrs(struct inode *inode) >> ((is_inode_flag_set(i, FI_ACL_MODE)) ? \ >> (F2FS_I(i)->i_acl_mode) : ((i)->i_mode)) >> >> +#define F2FS_MIN_EXTRA_ATTR_SIZE (sizeof(__le32)) >> + >> #define F2FS_TOTAL_EXTRA_ATTR_SIZE \ >> (offsetof(struct f2fs_inode, i_extra_end) - \ >> offsetof(struct f2fs_inode, i_extra_isize)) \ >> diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c >> index 0a1748444329..1e49009831c1 100644 >> --- a/fs/f2fs/inode.c >> +++ b/fs/f2fs/inode.c >> @@ -300,41 +300,79 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) >> return false; >> } >> >> - if (f2fs_sb_has_flexible_inline_xattr(sbi) >> - && !f2fs_has_extra_attr(inode)) { >> - set_sbi_flag(sbi, SBI_NEED_FSCK); >> - f2fs_warn(sbi, "%s: corrupted inode ino=%lx, run fsck to fix.", >> - __func__, inode->i_ino); >> - return false; >> - } >> - >> - if (f2fs_has_extra_attr(inode) && >> - !f2fs_sb_has_extra_attr(sbi)) { >> - set_sbi_flag(sbi, SBI_NEED_FSCK); >> - f2fs_warn(sbi, "%s: inode (ino=%lx) is with extra_attr, but extra_attr feature is off", >> - __func__, inode->i_ino); >> - return false; >> - } >> - >> - if (fi->i_extra_isize > F2FS_TOTAL_EXTRA_ATTR_SIZE || >> + if (f2fs_has_extra_attr(inode)) { >> + if (!f2fs_sb_has_extra_attr(sbi)) { >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: inode (ino=%lx) is with extra_attr, but extra_attr feature is off", >> + __func__, inode->i_ino); >> + return false; >> + } >> + if (fi->i_extra_isize > F2FS_TOTAL_EXTRA_ATTR_SIZE || >> + fi->i_extra_isize < F2FS_MIN_EXTRA_ATTR_SIZE || >> fi->i_extra_isize % sizeof(__le32)) { >> - set_sbi_flag(sbi, SBI_NEED_FSCK); >> - f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_extra_isize: %d, max: %zu", >> - __func__, inode->i_ino, fi->i_extra_isize, >> - F2FS_TOTAL_EXTRA_ATTR_SIZE); >> - return false; >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_extra_isize: %d, max: %zu", >> + __func__, inode->i_ino, fi->i_extra_isize, >> + F2FS_TOTAL_EXTRA_ATTR_SIZE); >> + return false; >> + } >> + if (f2fs_sb_has_flexible_inline_xattr(sbi) && >> + f2fs_has_inline_xattr(inode) && >> + (!fi->i_inline_xattr_size || >> + fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) { >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, max: %zu", >> + __func__, inode->i_ino, fi->i_inline_xattr_size, >> + MAX_INLINE_XATTR_SIZE); >> + return false; >> + } >> + if (f2fs_sb_has_compression(sbi) && >> + fi->i_flags & F2FS_COMPR_FL && >> + F2FS_FITS_IN_INODE(ri, fi->i_extra_isize, >> + i_compress_flag)) { >> + if (!sanity_check_compress_inode(inode, ri)) >> + return false; >> + } >> + } else { >> + if (f2fs_sb_has_flexible_inline_xattr(sbi)) { >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, run fsck to fix.", >> + __func__, inode->i_ino); >> + return false; >> + } >> } >> >> - if (f2fs_has_extra_attr(inode) && >> - f2fs_sb_has_flexible_inline_xattr(sbi) && >> - f2fs_has_inline_xattr(inode) && >> - (!fi->i_inline_xattr_size || >> - fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) { >> - set_sbi_flag(sbi, SBI_NEED_FSCK); >> - f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, max: %zu", >> - __func__, inode->i_ino, fi->i_inline_xattr_size, >> - MAX_INLINE_XATTR_SIZE); >> - return false; >> + if (!f2fs_sb_has_extra_attr(sbi)) { >> + if (f2fs_sb_has_project_quota(sbi)) { >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", >> + __func__, inode->i_ino, F2FS_FEATURE_PRJQUOTA); >> + return false; >> + } >> + if (f2fs_sb_has_inode_chksum(sbi)) { >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", >> + __func__, inode->i_ino, F2FS_FEATURE_INODE_CHKSUM); >> + return false; >> + } >> + if (f2fs_sb_has_flexible_inline_xattr(sbi)) { >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", >> + __func__, inode->i_ino, F2FS_FEATURE_FLEXIBLE_INLINE_XATTR); >> + return false; >> + } >> + if (f2fs_sb_has_inode_crtime(sbi)) { >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", >> + __func__, inode->i_ino, F2FS_FEATURE_INODE_CRTIME); >> + return false; >> + } >> + if (f2fs_sb_has_compression(sbi)) { >> + set_sbi_flag(sbi, SBI_NEED_FSCK); >> + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", >> + __func__, inode->i_ino, F2FS_FEATURE_COMPRESSION); >> + return false; >> + } >> } >> >> if (f2fs_sanity_check_inline_data(inode)) { >> @@ -358,12 +396,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) >> return false; >> } >> >> - if (f2fs_has_extra_attr(inode) && f2fs_sb_has_compression(sbi) && >> - fi->i_flags & F2FS_COMPR_FL && >> - F2FS_FITS_IN_INODE(ri, fi->i_extra_isize, >> - i_compress_flag)) >> - return sanity_check_compress_inode(inode, ri); >> - >> return true; >> } >> >> -- >> 2.40.1
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 9bd83fb28439..11c0bb12c686 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3424,6 +3424,8 @@ static inline int get_inline_xattr_addrs(struct inode *inode) ((is_inode_flag_set(i, FI_ACL_MODE)) ? \ (F2FS_I(i)->i_acl_mode) : ((i)->i_mode)) +#define F2FS_MIN_EXTRA_ATTR_SIZE (sizeof(__le32)) + #define F2FS_TOTAL_EXTRA_ATTR_SIZE \ (offsetof(struct f2fs_inode, i_extra_end) - \ offsetof(struct f2fs_inode, i_extra_isize)) \ diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 0a1748444329..1e49009831c1 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -300,41 +300,79 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) return false; } - if (f2fs_sb_has_flexible_inline_xattr(sbi) - && !f2fs_has_extra_attr(inode)) { - set_sbi_flag(sbi, SBI_NEED_FSCK); - f2fs_warn(sbi, "%s: corrupted inode ino=%lx, run fsck to fix.", - __func__, inode->i_ino); - return false; - } - - if (f2fs_has_extra_attr(inode) && - !f2fs_sb_has_extra_attr(sbi)) { - set_sbi_flag(sbi, SBI_NEED_FSCK); - f2fs_warn(sbi, "%s: inode (ino=%lx) is with extra_attr, but extra_attr feature is off", - __func__, inode->i_ino); - return false; - } - - if (fi->i_extra_isize > F2FS_TOTAL_EXTRA_ATTR_SIZE || + if (f2fs_has_extra_attr(inode)) { + if (!f2fs_sb_has_extra_attr(sbi)) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: inode (ino=%lx) is with extra_attr, but extra_attr feature is off", + __func__, inode->i_ino); + return false; + } + if (fi->i_extra_isize > F2FS_TOTAL_EXTRA_ATTR_SIZE || + fi->i_extra_isize < F2FS_MIN_EXTRA_ATTR_SIZE || fi->i_extra_isize % sizeof(__le32)) { - set_sbi_flag(sbi, SBI_NEED_FSCK); - f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_extra_isize: %d, max: %zu", - __func__, inode->i_ino, fi->i_extra_isize, - F2FS_TOTAL_EXTRA_ATTR_SIZE); - return false; + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_extra_isize: %d, max: %zu", + __func__, inode->i_ino, fi->i_extra_isize, + F2FS_TOTAL_EXTRA_ATTR_SIZE); + return false; + } + if (f2fs_sb_has_flexible_inline_xattr(sbi) && + f2fs_has_inline_xattr(inode) && + (!fi->i_inline_xattr_size || + fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, max: %zu", + __func__, inode->i_ino, fi->i_inline_xattr_size, + MAX_INLINE_XATTR_SIZE); + return false; + } + if (f2fs_sb_has_compression(sbi) && + fi->i_flags & F2FS_COMPR_FL && + F2FS_FITS_IN_INODE(ri, fi->i_extra_isize, + i_compress_flag)) { + if (!sanity_check_compress_inode(inode, ri)) + return false; + } + } else { + if (f2fs_sb_has_flexible_inline_xattr(sbi)) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, run fsck to fix.", + __func__, inode->i_ino); + return false; + } } - if (f2fs_has_extra_attr(inode) && - f2fs_sb_has_flexible_inline_xattr(sbi) && - f2fs_has_inline_xattr(inode) && - (!fi->i_inline_xattr_size || - fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) { - set_sbi_flag(sbi, SBI_NEED_FSCK); - f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, max: %zu", - __func__, inode->i_ino, fi->i_inline_xattr_size, - MAX_INLINE_XATTR_SIZE); - return false; + if (!f2fs_sb_has_extra_attr(sbi)) { + if (f2fs_sb_has_project_quota(sbi)) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", + __func__, inode->i_ino, F2FS_FEATURE_PRJQUOTA); + return false; + } + if (f2fs_sb_has_inode_chksum(sbi)) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", + __func__, inode->i_ino, F2FS_FEATURE_INODE_CHKSUM); + return false; + } + if (f2fs_sb_has_flexible_inline_xattr(sbi)) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", + __func__, inode->i_ino, F2FS_FEATURE_FLEXIBLE_INLINE_XATTR); + return false; + } + if (f2fs_sb_has_inode_crtime(sbi)) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", + __func__, inode->i_ino, F2FS_FEATURE_INODE_CRTIME); + return false; + } + if (f2fs_sb_has_compression(sbi)) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_warn(sbi, "%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix.", + __func__, inode->i_ino, F2FS_FEATURE_COMPRESSION); + return false; + } } if (f2fs_sanity_check_inline_data(inode)) { @@ -358,12 +396,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) return false; } - if (f2fs_has_extra_attr(inode) && f2fs_sb_has_compression(sbi) && - fi->i_flags & F2FS_COMPR_FL && - F2FS_FITS_IN_INODE(ri, fi->i_extra_isize, - i_compress_flag)) - return sanity_check_compress_inode(inode, ri); - return true; }
This patch does below changes: - clean up check condition - add sanity check for i_extra_isize w/ lower boundary - add sanity check for feature dependency - check i_extra_isize only if f2fs_has_extra_attr() is true Signed-off-by: Chao Yu <chao@kernel.org> --- fs/f2fs/f2fs.h | 2 + fs/f2fs/inode.c | 108 +++++++++++++++++++++++++++++++----------------- 2 files changed, 72 insertions(+), 38 deletions(-)