From patchwork Tue May 21 06:23:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 13668929 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 40453C25B74 for ; Tue, 21 May 2024 06:23:40 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1s9IuR-0007jf-Cz; Tue, 21 May 2024 06:23:38 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1s9IuQ-0007jZ-BT for linux-f2fs-devel@lists.sourceforge.net; Tue, 21 May 2024 06:23:37 +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=4usKmKBzjMMABFQ/lVJnBjWjiiCYlUiRjjAeCWewYlU=; b=mISCjp9xjMR/CootGGzaMHkm1B SRLIdswilVcKmMB6F9aFZqIzJFJAvFBq8VaC+bn3dmXtHdocsjMFXuFq74q8N4p7t2FRyfA2o1LJl SMOr8jQwkaSCIBY3We6EiFnxjorgRZ6nCLCvXYRr8R+vvnuVBd+FL8jhCCMgzc45FjXQ=; 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=4usKmKBzjMMABFQ/lVJnBjWjiiCYlUiRjjAeCWewYlU=; b=c J4diwQHhSEekSyuABon2U7v4wr5cdmXSZOVp3kwF9pBoPenC0928CTHacXJh1mIgnuS1eijxcrdBg 2JcLQBvCp/o6PCCeL9sRBJFAAbI7Ssl+Es1XXDa3aQiMkjXpHACEgvA731rU4r7fOwwDL/4dIp0Cs pYZONRDaoQ7EhMaI=; Received: from sin.source.kernel.org ([145.40.73.55]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1s9IuP-0004jJ-Ku for linux-f2fs-devel@lists.sourceforge.net; Tue, 21 May 2024 06:23:37 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 23751CE0D9B; Tue, 21 May 2024 06:23:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8000C2BD11; Tue, 21 May 2024 06:23:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716272604; bh=odx4SQSvXrGL/qq166LumzG7isir+IkfTpnUohZn0So=; h=From:To:Cc:Subject:Date:From; b=qNrqp1/qHfT7ahY/xryTTZIg3E0pD7/U7AiJGmU7jbniebzOK57fSeKbEOwIZd//2 Afe9+vMvEFlGwaWKjVTFCodVsoKR/S9pRlCBX95Mp8Ul/lvAWwHi+enD4s3CTWcABb 2OOYuOCggiYljTipsT34rTAK3nfLmSFqQ87XlnVyCDejtlD8Nd6movo33n/EfHr7Ke 76TGAiVuntnCxMEkE735iSMou7f0ts/Cqy0T479F7enqDrVrXut51o4bd98ptI3QvJ plEeDGA4ntqRvbc7GCojMSHV5WUUT7RsAejewPF8pn6NjUkz47KTC5Mkrj6ow0w24n 4sO2JBs/pU2Ug== From: Chao Yu To: jaegeuk@kernel.org Date: Tue, 21 May 2024 14:23:17 +0800 Message-Id: <20240521062318.976239-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Headers-End: 1s9IuP-0004jJ-Ku Subject: [f2fs-dev] [PATCH 1/2] f2fs: fix to do sanity check on F2FS_INLINE_DATA flag in inode during GC 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, syzbot+848062ba19c8782ca5c8@syzkaller.appspotmail.com, linux-f2fs-devel@lists.sourceforge.net Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net syzbot reports a f2fs bug as below: ------------[ cut here ]------------ kernel BUG at fs/f2fs/inline.c:258! CPU: 1 PID: 34 Comm: kworker/u8:2 Not tainted 6.9.0-rc6-syzkaller-00012-g9e4bc4bcae01 #0 RIP: 0010:f2fs_write_inline_data+0x781/0x790 fs/f2fs/inline.c:258 Call Trace: f2fs_write_single_data_page+0xb65/0x1d60 fs/f2fs/data.c:2834 f2fs_write_cache_pages fs/f2fs/data.c:3133 [inline] __f2fs_write_data_pages fs/f2fs/data.c:3288 [inline] f2fs_write_data_pages+0x1efe/0x3a90 fs/f2fs/data.c:3315 do_writepages+0x35b/0x870 mm/page-writeback.c:2612 __writeback_single_inode+0x165/0x10b0 fs/fs-writeback.c:1650 writeback_sb_inodes+0x905/0x1260 fs/fs-writeback.c:1941 wb_writeback+0x457/0xce0 fs/fs-writeback.c:2117 wb_do_writeback fs/fs-writeback.c:2264 [inline] wb_workfn+0x410/0x1090 fs/fs-writeback.c:2304 process_one_work kernel/workqueue.c:3254 [inline] process_scheduled_works+0xa12/0x17c0 kernel/workqueue.c:3335 worker_thread+0x86d/0xd70 kernel/workqueue.c:3416 kthread+0x2f2/0x390 kernel/kthread.c:388 ret_from_fork+0x4d/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 The root cause is: inline_data inode can be fuzzed, so that there may be valid blkaddr in its direct node, once f2fs triggers background GC to migrate the block, it will hit f2fs_bug_on() during dirty page writeback. Let's add sanity check on F2FS_INLINE_DATA flag in inode during GC, so that, it can forbid migrating inline_data inode's data block for fixing. Reported-by: syzbot+848062ba19c8782ca5c8@syzkaller.appspotmail.com Closes: https://lore.kernel.org/linux-f2fs-devel/000000000000d103ce06174d7ec3@google.com Signed-off-by: Chao Yu --- fs/f2fs/gc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 6066c6eecf41..20e2f989013b 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -1563,6 +1563,16 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, continue; } + if (f2fs_has_inline_data(inode)) { + iput(inode); + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_err_ratelimited(sbi, + "inode %lx has both inline_data flag and " + "data block, nid=%u, ofs_in_node=%u", + inode->i_ino, dni.nid, ofs_in_node); + continue; + } + err = f2fs_gc_pinned_control(inode, gc_type, segno); if (err == -EAGAIN) { iput(inode); From patchwork Tue May 21 06:23:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 13668930 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 B505FC25B7B for ; Tue, 21 May 2024 06:23:40 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1s9IuQ-0004vB-F2; Tue, 21 May 2024 06:23:38 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1s9IuO-0004uv-Vm for linux-f2fs-devel@lists.sourceforge.net; Tue, 21 May 2024 06:23:37 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=r4SUQ9ehFXZpKcSTHqiP0V3vLOt+OwM3jqjgGkQvWVU=; b=Acc/kaGBYKzJ0rMXna0qU+4ptb XkVRZ613+yCvVYiFA7uRJFxGYEcsO4jGiCw/cnoDyprJ0ku0F6Pbwm/oDQG1a1UfX2QCWBd4DgLgl pwmaFoWUxVGETIEI/BQdbdwcp2wYUUrKV0A0rcYqMfFFywv0lswdfuhPNUv7bSb1sGxg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=r4SUQ9ehFXZpKcSTHqiP0V3vLOt+OwM3jqjgGkQvWVU=; b=TtIVn9VxovFfzoJFqzgOlmuVc3 voGoHr9SZIx9w9XXqL9xJTmTCzUXqrg1XuzD/Ww4Qa01apybMZ6bbnfQhk3wLbqTrCAEFHcEhPP8G yLlpDAgAE1ael8aqW+/TF26KKCbhtZmeji6kpZW5SizKw39T3KveUBFdbv9rGRDspY6Y=; Received: from dfw.source.kernel.org ([139.178.84.217]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1s9IuP-0004jK-9U for linux-f2fs-devel@lists.sourceforge.net; Tue, 21 May 2024 06:23:37 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 2967561F9F for ; Tue, 21 May 2024 06:23:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D0FFC32782; Tue, 21 May 2024 06:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716272605; bh=z2zWkZoAbBUOoRu9L0FDN+Y3ekt5ZHAk9uTFd+2UwXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lrV12VBQSRy9OjwkVc63XQXS0bxwX4JLnUtwb6jy/PGHhcZMG6TOww20NBtrsHR1D o2e+exiAAT9ALlQK8+S6KRCfVI+k2smDOCk+f1QiE/7MSyg1tTEzz3R2tb752UudDx oDI7On0GnQAz5d0dJsaI3HMUDfFPL1MRyRzErLHP3LvMLu8qzwBZj++z4X45vTvIFE 03QHRIg+9DhFWeu5g/JPmmYpOoaEgEbaDPUTSTELPTGJuLiNFhRVVn57fhZX//Va4w hrYfqlRjtvXAJcHJ7Fao0/pTdmk9o6e7cbqc5VkHoRNJ7pFihbFm8AVtwnSZ1DonQx AGr0Mg6PltR/A== From: Chao Yu To: jaegeuk@kernel.org Date: Tue, 21 May 2024 14:23:18 +0800 Message-Id: <20240521062318.976239-2-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240521062318.976239-1-chao@kernel.org> References: <20240521062318.976239-1-chao@kernel.org> MIME-Version: 1.0 X-Headers-End: 1s9IuP-0004jK-9U Subject: [f2fs-dev] [PATCH 2/2] f2fs: fix to do sanity check on blocks for inline_data 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, linux-f2fs-devel@lists.sourceforge.net Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net inode can be fuzzed, so it can has F2FS_INLINE_DATA flag and valid i_blocks/i_nid value, this patch supports to do extra sanity check to detect such corrupted state. Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 2 +- fs/f2fs/inline.c | 20 +++++++++++++++++++- fs/f2fs/inode.c | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 1974b6aff397..f463961b497c 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4149,7 +4149,7 @@ extern struct kmem_cache *f2fs_inode_entry_slab; * inline.c */ bool f2fs_may_inline_data(struct inode *inode); -bool f2fs_sanity_check_inline_data(struct inode *inode); +bool f2fs_sanity_check_inline_data(struct inode *inode, struct page *ipage); bool f2fs_may_inline_dentry(struct inode *inode); void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage); void f2fs_truncate_inline_inode(struct inode *inode, diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 7638d0d7b7ee..0203c3baabb6 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -33,11 +33,29 @@ bool f2fs_may_inline_data(struct inode *inode) return !f2fs_post_read_required(inode); } -bool f2fs_sanity_check_inline_data(struct inode *inode) +static bool inode_has_blocks(struct inode *inode, struct page *ipage) +{ + struct f2fs_inode *ri = F2FS_INODE(ipage); + int i; + + if (F2FS_HAS_BLOCKS(inode)) + return true; + + for (i = 0; i < DEF_NIDS_PER_INODE; i++) { + if (ri->i_nid[i]) + return true; + } + return false; +} + +bool f2fs_sanity_check_inline_data(struct inode *inode, struct page *ipage) { if (!f2fs_has_inline_data(inode)) return false; + if (inode_has_blocks(inode, ipage)) + return false; + if (!support_inline_data(inode)) return true; diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 791c06e159fd..4b39aebd3c70 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -344,7 +344,7 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) } } - if (f2fs_sanity_check_inline_data(inode)) { + if (f2fs_sanity_check_inline_data(inode, node_page)) { 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); return false;