From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2CD1C77B73 for ; Tue, 30 May 2023 23:03:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233452AbjE3XDe (ORCPT ); Tue, 30 May 2023 19:03:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229794AbjE3XDc (ORCPT ); Tue, 30 May 2023 19:03:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75708E8 for ; Tue, 30 May 2023 16:03:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 02F2C6181B for ; Tue, 30 May 2023 23:03:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 429F3C433EF; Tue, 30 May 2023 23:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685487810; bh=0Thf2vGiVZB40K3tYyJIw8Ovlj3DnYCkuF6fIzUtijY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=KQ/ilYy34kkEJKDalLo+4Y4jHP7NpCUcWH7lLt8EB6FdyOHw+t3vK1RUQfD/aSvZJ hIQzlvcFfE2ZWwGGmduwLwgaUdeMISjkVxmD4LtvIjSvY0jPZNfBn3zTaPKPmv5pnU jyqr3hb5R6dBSQxRFHTVMLxLxUq7K7fQ6OrVa1QHqdX/KBKtDpQJIQurXU5PGn0nKd VyvPD2nii0125SpdktRH8AEWD8bLZXy2My6rAD63hOubjD7R8gKPmf/FI3EN6NM/eo /R4bwsNiKUaF0MOlCKntioy5rFSu5i6E5x476i26oYTioVbZkBZxiIXmXB1zL5H05g bk4f93Ejp0QgQ== Date: Tue, 30 May 2023 16:03:28 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH] f2fs: do more sanity check on inode Message-ID: References: <20230529102755.2547478-1-chao@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230529102755.2547478-1-chao@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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