| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1188a53e-abfb-8fe2-6337-3845ac103d61@kernel.org>
Date: Tue, 13 Jun 2023 09:17:13 +0800
From: Chao Yu <chao@...nel.org>
To: Jaegeuk Kim <jaegeuk@...nel.org>
Cc: linux-f2fs-devel@...ts.sourceforge.net,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] f2fs: do more sanity check on inode
On 2023/6/13 4:16, Jaegeuk Kim wrote:
> On 05/31, Chao Yu wrote:
>> There are several issues in sanity_check_inode():
>> - The code looks not clean, it checks extra_attr related condition
>> dispersively.
>> - It missed to check i_extra_isize w/ lower boundary
>> - It missed to check feature dependency: prjquota, inode_chksum,
>> inode_crtime, compression features rely on extra_attr feature.
>> - It's not necessary to check i_extra_isize due to it will only
>> be assigned to non-zero value if f2fs_has_extra_attr() is true
>> in do_read_inode().
>>
>> Fix them all in this patch.
>>
>> Signed-off-by: Chao Yu <chao@...nel.org>
>> ---
>> v2:
>> - describe current problem in commit message
>> 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 7e406da8b4b3..619ad49993ce 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -3413,6 +3413,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)) {
>
> Modified to combine else if.
Better, thanks.
Thanks,
>
>> + 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
Powered by blists - more mailing lists