From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBF6D19F485; Tue, 30 Jul 2024 12:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722343524; cv=none; b=uA3AtsO2mxymadbrBhq7s/2YznQISQRfXh0nRQIMAb89ksX782vtqwtt4m2OdM5ljVsLu/e0jbN4qd1S3ePXqPApRgjpJieI4vIXqTcxvx4QSgfotV0XkHE/LiLENzsnFdOlhoAkN2lLY57PdgoGTYmuI1bB1PEFTEIYISBp4Dg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722343524; c=relaxed/simple; bh=a06fT59JYSEYGZu3uqZ7J/4JW8k25L+XSMr8vDSImjI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rSeF1mJf6Hlyv1XxGQvgwJnZgDydfU7jmKyyJbqxZ0AkDZDGm2DrBpR63EnxSTsCjQJuSpIwjzBorunagsOY9tp9g3XSHglVV3leajSZ6f6T5qhrT0c87Pb6xNgiua1ZqAulaq8qQlBBepHECTyc3GFW60Cdb7kYbb3Dif7FWqA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MdziFkDx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MdziFkDx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E18AAC4AF09; Tue, 30 Jul 2024 12:45:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722343523; bh=a06fT59JYSEYGZu3uqZ7J/4JW8k25L+XSMr8vDSImjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MdziFkDxmn2RyXHWN/E5BZBLOU+FLjHLYf3uy0yDZC+zGYX4pgszNh04JC386fBxF RNdAwsKrNI/BVkfpPhaDiI7IjGDIPy+kjJg7cUukGGRmbCTykXIAxyY1CaKeIzoWZn ZZ1npzkjIqK4eVx8Yvjkg1FafKtNYcvaX5juD2RhFJjUc3UZaajoUBUIXfLLaawkQc PO/iJ2G9r9yB3RQ6Eju5Ppr7mM08zSewcWppyNcQtoDJG/Y2YCLnWLRMm03mxHuCjQ NznBA8gFsNcGz3ZgEodpotGu0orkyxRlEwgRN7TLuPz3Th5mHORXgEMu1bhPlm/Bl7 zjF06p8BesLEg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chao Yu , Jaegeuk Kim , Sasha Levin , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH AUTOSEL 6.10 2/7] f2fs: fix to do sanity check on blocks for inline_data inode Date: Tue, 30 Jul 2024 08:45:08 -0400 Message-ID: <20240730124519.3093607-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240730124519.3093607-1-sashal@kernel.org> References: <20240730124519.3093607-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.2 Content-Transfer-Encoding: 8bit From: Chao Yu [ Upstream commit c240c87bcd44a1a2375fc8ef8c645d1f1fe76466 ] 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 Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- 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 1974b6aff397c..f463961b497c4 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 7638d0d7b7eed..0203c3baabb66 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 005dde72aff3d..33b2778d54525 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; -- 2.43.0