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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E34BC433F5 for ; Sun, 15 May 2022 09:06:19 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nqACf-0004ab-K3; Sun, 15 May 2022 09:06:16 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nqACV-0004aP-Ka for linux-f2fs-devel@lists.sourceforge.net; Sun, 15 May 2022 09:06:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=S7EUqAIjWFIxm/DJTSrRLtLMq6nn33T45s7tfqHnv8o=; b=Eg8MbDeSo0mfbWV+90JhjDTlkH RRmYYD1QlrZVeLMhsPxPF2xSivUR1g952CtAL87NzRFY4JcD+/C8T3RL1DLhAyr583Dz0cA34fU96 RBwYbonIDW6vLiQqSF/b4fYa0kllHf6iR7frFOzTgf0zc87icCN4bKlS0aaxNXh7mqUw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=S7EUqAIjWFIxm/DJTSrRLtLMq6nn33T45s7tfqHnv8o=; b=C W1U0rL3WwjNbnhQCID+tIFrXWQZIBKq0L9PR71J0fbLO/ittKQdiLal87eLtIRtJHZpe7NtGfOQid 63ckLAr1bPGHV7fbYbCnXH1qJ9pN06szZe+PdmwiF5h3/OP4WWnQNFNNli7XTuCTPUixrRqAEnyea E9ibZVID8vfpkpMs=; Received: from ams.source.kernel.org ([145.40.68.75]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nqACP-0001vR-Kw for linux-f2fs-devel@lists.sourceforge.net; Sun, 15 May 2022 09:06:05 +0000 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 ams.source.kernel.org (Postfix) with ESMTPS id C7626B80AF1; Sun, 15 May 2022 09:05:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C060C385B8; Sun, 15 May 2022 09:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652605553; bh=Mwj8x5n/ya19o/UjDZ9DoXSZRKW2j74+Pxpl01vamHo=; h=From:To:Cc:Subject:Date:From; b=Aw8nfDi+XuMAAvR8hXetPUqHAMISpxvq/+AC3YD6OlFkrUOrRQrZ1Ak72n1lAmdT2 N9a0UuSW1irAO31CoFBE/4uD5AVZ77ZriRkVJX7OfEnShDnVEZZtTqEF9CGc2v3qX3 ypfyVg5YVIV80gg5sAi46/WGSKQpQPKut23DiTxeVWm0K1lReth16WCT0vQDiq0R00 O58qgnIlyRsLttNVpJhPVHA4nibzXiw8VuYKLzxh8r+Zq3xOhFtnzz8TkMec2CzzOH nZG33bMVgW6VMsoPZlkgbCJvcMijg10UgcdjBfK1nch1wLlIDfiX0yLSUu582iM2cd zUnzgPBA+TONQ== From: Chao Yu To: jaegeuk@kernel.org Date: Sun, 15 May 2022 17:05:47 +0800 Message-Id: <20220515090547.1914-1-chao@kernel.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Headers-End: 1nqACP-0001vR-Kw Subject: [f2fs-dev] [PATCH v3] f2fs: fix to do sanity check for inline inode X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Ming Yan Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Yanming reported a kernel bug in Bugzilla kernel [1], which can be reproduced. The bug message is: The kernel message is shown below: kernel BUG at fs/inode.c:611! Call Trace: evict+0x282/0x4e0 __dentry_kill+0x2b2/0x4d0 dput+0x2dd/0x720 do_renameat2+0x596/0x970 __x64_sys_rename+0x78/0x90 do_syscall_64+0x3b/0x90 [1] https://bugzilla.kernel.org/show_bug.cgi?id=215895 The bug is due to fuzzed inode has both inline_data and encrypted flags. During f2fs_evict_inode(), as the inode was deleted by rename(), it will cause inline data conversion due to conflicting flags. The page cache will be polluted and the panic will be triggered in clear_inode(). Try fixing the bug by doing more sanity checks for inline data inode in sanity_check_inode(). Cc: stable@vger.kernel.org Reported-by: Ming Yan Signed-off-by: Chao Yu --- v3: - clean up commit message suggested by Bagas Sanjaya. fs/f2fs/f2fs.h | 8 ++++++++ fs/f2fs/inode.c | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 492af5b96de1..0dc2461ef02c 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4126,6 +4126,14 @@ static inline void f2fs_set_encrypted_inode(struct inode *inode) */ static inline bool f2fs_post_read_required(struct inode *inode) { + /* + * used by sanity_check_inode(), when disk layout fields has not + * been synchronized to inmem fields. + */ + if (S_ISREG(inode->i_mode) && (file_is_encrypt(inode) || + F2FS_I(inode)->i_flags & F2FS_COMPR_FL || + file_is_verity(inode))) + return true; return f2fs_encrypted_file(inode) || fsverity_active(inode) || f2fs_compressed_file(inode); } diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 2fce8fa0dac8..5e494c98e3c2 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -276,8 +276,7 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) } } - if (f2fs_has_inline_data(inode) && - (!S_ISREG(inode->i_mode) && !S_ISLNK(inode->i_mode))) { + if (f2fs_has_inline_data(inode) && !f2fs_may_inline_data(inode)) { set_sbi_flag(sbi, SBI_NEED_FSCK); f2fs_warn(sbi, "%s: inode (ino=%lx, mode=%u) should not have inline_data, run fsck to fix", __func__, inode->i_ino, inode->i_mode); -- 2.32.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel 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 14686C433EF for ; Sun, 15 May 2022 09:06:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236016AbiEOJGG (ORCPT ); Sun, 15 May 2022 05:06:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236015AbiEOJF4 (ORCPT ); Sun, 15 May 2022 05:05:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FB40765C; Sun, 15 May 2022 02:05:56 -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 ams.source.kernel.org (Postfix) with ESMTPS id D3C4FB80AF2; Sun, 15 May 2022 09:05:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C060C385B8; Sun, 15 May 2022 09:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652605553; bh=Mwj8x5n/ya19o/UjDZ9DoXSZRKW2j74+Pxpl01vamHo=; h=From:To:Cc:Subject:Date:From; b=Aw8nfDi+XuMAAvR8hXetPUqHAMISpxvq/+AC3YD6OlFkrUOrRQrZ1Ak72n1lAmdT2 N9a0UuSW1irAO31CoFBE/4uD5AVZ77ZriRkVJX7OfEnShDnVEZZtTqEF9CGc2v3qX3 ypfyVg5YVIV80gg5sAi46/WGSKQpQPKut23DiTxeVWm0K1lReth16WCT0vQDiq0R00 O58qgnIlyRsLttNVpJhPVHA4nibzXiw8VuYKLzxh8r+Zq3xOhFtnzz8TkMec2CzzOH nZG33bMVgW6VMsoPZlkgbCJvcMijg10UgcdjBfK1nch1wLlIDfiX0yLSUu582iM2cd zUnzgPBA+TONQ== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu , stable@vger.kernel.org, Ming Yan , Chao Yu Subject: [PATCH v3] f2fs: fix to do sanity check for inline inode Date: Sun, 15 May 2022 17:05:47 +0800 Message-Id: <20220515090547.1914-1-chao@kernel.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Yanming reported a kernel bug in Bugzilla kernel [1], which can be reproduced. The bug message is: The kernel message is shown below: kernel BUG at fs/inode.c:611! Call Trace: evict+0x282/0x4e0 __dentry_kill+0x2b2/0x4d0 dput+0x2dd/0x720 do_renameat2+0x596/0x970 __x64_sys_rename+0x78/0x90 do_syscall_64+0x3b/0x90 [1] https://bugzilla.kernel.org/show_bug.cgi?id=215895 The bug is due to fuzzed inode has both inline_data and encrypted flags. During f2fs_evict_inode(), as the inode was deleted by rename(), it will cause inline data conversion due to conflicting flags. The page cache will be polluted and the panic will be triggered in clear_inode(). Try fixing the bug by doing more sanity checks for inline data inode in sanity_check_inode(). Cc: stable@vger.kernel.org Reported-by: Ming Yan Signed-off-by: Chao Yu --- v3: - clean up commit message suggested by Bagas Sanjaya. fs/f2fs/f2fs.h | 8 ++++++++ fs/f2fs/inode.c | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 492af5b96de1..0dc2461ef02c 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4126,6 +4126,14 @@ static inline void f2fs_set_encrypted_inode(struct inode *inode) */ static inline bool f2fs_post_read_required(struct inode *inode) { + /* + * used by sanity_check_inode(), when disk layout fields has not + * been synchronized to inmem fields. + */ + if (S_ISREG(inode->i_mode) && (file_is_encrypt(inode) || + F2FS_I(inode)->i_flags & F2FS_COMPR_FL || + file_is_verity(inode))) + return true; return f2fs_encrypted_file(inode) || fsverity_active(inode) || f2fs_compressed_file(inode); } diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 2fce8fa0dac8..5e494c98e3c2 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -276,8 +276,7 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) } } - if (f2fs_has_inline_data(inode) && - (!S_ISREG(inode->i_mode) && !S_ISLNK(inode->i_mode))) { + if (f2fs_has_inline_data(inode) && !f2fs_may_inline_data(inode)) { set_sbi_flag(sbi, SBI_NEED_FSCK); f2fs_warn(sbi, "%s: inode (ino=%lx, mode=%u) should not have inline_data, run fsck to fix", __func__, inode->i_ino, inode->i_mode); -- 2.32.0