diff mbox series

[20/43] xfs: sb verifier doesn't handle uncached sb buffer

Message ID	163158730925.1604118.17231730849319617732.stgit@magnolia (mailing list archive)
State	Accepted
Headers	show Return-Path: <linux-xfs-owner@kernel.org> Subject: [PATCH 20/43] xfs: sb verifier doesn't handle uncached sb buffer From: "Darrick J. Wong" <djwong@kernel.org> To: sandeen@sandeen.net, djwong@kernel.org Cc: Dave Chinner <dchinner@redhat.com>, Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org Date: Mon, 13 Sep 2021 19:41:49 -0700 Message-ID: <163158730925.1604118.17231730849319617732.stgit@magnolia> In-Reply-To: <163158719952.1604118.14415288328687941574.stgit@magnolia> References: <163158719952.1604118.14415288328687941574.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	xfs: sync libxfs with 5.15 \| expand [PATCHSET,00/43] xfs: sync libxfs with 5.15 [01/43] xfs_{copy,db,logprint,repair}: pass xfs_mount pointers instead of xfs_sb pointers [02/43] xfs: remove support for disabling quota accounting on a mounted file system [03/43] xfs: remove the active vs running quota differentiation [04/43] xfs: replace kmem_alloc_large() with kvmalloc() [05/43] xfs: allow setting and clearing of log incompat feature flags [06/43] xfs: add attr state machine tracepoints [07/43] xfs: Rename __xfs_attr_rmtval_remove [08/43] xfs: make xfs_rtalloc_query_range input parameters const [09/43] xfs: make the key parameters to all btree key comparison functions const [10/43] xfs: make the key parameters to all btree query range functions const [11/43] xfs: make the record pointer passed to query_range functions const [12/43] xfs: mark the record passed into btree init_key functions as const [13/43] xfs: make the keys and records passed to btree inorder functions const [14/43] xfs: mark the record passed into xchk_btree functions as const [15/43] xfs: make the pointer passed to btree set_root functions const [16/43] xfs: make the start pointer passed to btree alloc_block functions const [17/43] xfs: make the start pointer passed to btree update_lastrec functions const [18/43] xfs: constify btree function parameters that are not modified [19/43] xfs: resolve fork names in trace output [20/43] xfs: sb verifier doesn't handle uncached sb buffer [21/43] xfs: rename xfs_has_attr() [22/43] xfs: rework attr2 feature and mount options [23/43] xfs: reflect sb features in xfs_mount [24/43] xfs: replace xfs_sb_version checks with feature flag checks [25/43] xfs: convert mount flags to features [26/43] xfs: convert remaining mount flags to state flags [27/43] xfs: replace XFS_FORCED_SHUTDOWN with xfs_is_shutdown [28/43] xfs: convert xfs_fs_geometry to use mount feature checks [29/43] xfs: open code sb verifier feature checks [30/43] xfs: convert xfs_sb_version_has checks to use mount features [31/43] libxlog: replace xfs_sb_version checks with feature flag checks [32/43] libxfs: replace xfs_sb_version checks with feature flag checks [33/43] xfs_{copy,db,logprint,repair}: replace xfs_sb_version checks with feature flag checks [34/43] xfs: remove unused xfs_sb_version_has wrappers [35/43] xfs: introduce xfs_sb_is_v5 helper [36/43] xfs: kill xfs_sb_version_has_v3inode() [37/43] libxfs: use opstate flags and functions for libxfs mount options [38/43] libxfs: remove pointless XFS_MOUNT flags [39/43] libxfs: always initialize internal buffer map [40/43] libxfs: replace XFS_BUF_SET_ADDR with a function [41/43] xfs: introduce xfs_buf_daddr() [42/43] xfs: convert bp->b_bn references to xfs_buf_daddr() [43/43] libxfs: rename buffer cache index variable b_bn

Commit Message

Darrick J. Wong Sept. 14, 2021, 2:41 a.m. UTC

From: Dave Chinner <dchinner@redhat.com>

Source kernel commit: 8cf07f3dd56195316be97758cb8b4e1d7183ea84

The verifier checks explicitly for bp->b_bn == XFS_SB_DADDR to match
the primary superblock buffer, but the primary superblock is an
uncached buffer and so bp->b_bn is always -1ULL. Hence this never
matches and the CRC error reporting is wholly dependent on the
mount superblock already being populated so CRC feature checks pass
and allow CRC errors to be reported.

Fix this so that the primary superblock CRC error reporting is not
dependent on already having read the superblock into memory.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 libxfs/xfs_sb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index b2e214ee..f29a59ae 100644
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -634,7 +634,7 @@  xfs_sb_read_verify(
 
 		if (!xfs_buf_verify_cksum(bp, XFS_SB_CRC_OFF)) {
 			/* Only fail bad secondaries on a known V5 filesystem */
-			if (bp->b_bn == XFS_SB_DADDR ||
+			if (bp->b_maps[0].bm_bn == XFS_SB_DADDR ||
 			    xfs_sb_version_hascrc(&mp->m_sb)) {
 				error = -EFSBADCRC;
 				goto out_error;