public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 04/32] xfs: check magic numbers in dir3 leaf verifier first
Date: Mon, 30 Sep 2013 13:15:16 +1000	[thread overview]
Message-ID: <1380510944-8571-5-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1380510944-8571-1-git-send-email-david@fromorbit.com>

From: Dave Chinner <dchinner@redhat.com>

Calling xfs_dir3_leaf_hdr_from_disk() in a verifier before
validating the magic numbers in the buffer results in ASSERT
failures due to mismatching magic numbers when a corruption occurs.
Seeing as the verifier is supposed to catch the corruption and pass
it back to the caller, having the verifier assert fail on error
defeats the purpose of detecting the errors in the first place.

Check the magic numbers direct from the buffer before decoding the
header.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 libxfs/xfs_dir2_leaf.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c
index 7ec2f19..c035c4d 100644
--- a/libxfs/xfs_dir2_leaf.c
+++ b/libxfs/xfs_dir2_leaf.c
@@ -161,6 +161,11 @@ xfs_dir3_leaf_check_int(
 	return true;
 }
 
+/*
+ * We verify the magic numbers before decoding the leaf header so that on debug
+ * kernels we don't get assertion failures in xfs_dir3_leaf_hdr_from_disk() due
+ * to incorrect magic numbers.
+ */
 static bool
 xfs_dir3_leaf_verify(
 	struct xfs_buf		*bp,
@@ -172,24 +177,25 @@ xfs_dir3_leaf_verify(
 
 	ASSERT(magic == XFS_DIR2_LEAF1_MAGIC || magic == XFS_DIR2_LEAFN_MAGIC);
 
-	xfs_dir3_leaf_hdr_from_disk(&leafhdr, leaf);
 	if (xfs_sb_version_hascrc(&mp->m_sb)) {
 		struct xfs_dir3_leaf_hdr *leaf3 = bp->b_addr;
+		__uint16_t		magic3;
 
-		if ((magic == XFS_DIR2_LEAF1_MAGIC &&
-		     leafhdr.magic != XFS_DIR3_LEAF1_MAGIC) ||
-		    (magic == XFS_DIR2_LEAFN_MAGIC &&
-		     leafhdr.magic != XFS_DIR3_LEAFN_MAGIC))
-			return false;
+		magic3 = (magic == XFS_DIR2_LEAF1_MAGIC) ? XFS_DIR3_LEAF1_MAGIC
+							 : XFS_DIR3_LEAFN_MAGIC;
 
+		if (leaf3->info.hdr.magic != cpu_to_be16(magic3))
+			return false;
 		if (!uuid_equal(&leaf3->info.uuid, &mp->m_sb.sb_uuid))
 			return false;
 		if (be64_to_cpu(leaf3->info.blkno) != bp->b_bn)
 			return false;
 	} else {
-		if (leafhdr.magic != magic)
+		if (leaf->hdr.info.magic != cpu_to_be16(magic))
 			return false;
 	}
+
+	xfs_dir3_leaf_hdr_from_disk(&leafhdr, leaf);
 	return xfs_dir3_leaf_check_int(mp, &leafhdr, leaf);
 }
 
-- 
1.8.3.2

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2013-09-30  3:15 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1380510944-8571-1-git-send-email-david@fromorbit.com>
2013-09-30  3:15 ` [PATCH 01/32] xfsprogs: fix automatic dependency generation Dave Chinner
2013-10-08 23:00   ` Eric Sandeen
2013-09-30  3:15 ` [PATCH 02/32] libxfs: fix missing filetype updates to xfs_dir2.c Dave Chinner
2013-10-08 22:53   ` Eric Sandeen
2013-10-09 20:41     ` Dave Chinner
2013-10-18 16:45   ` Rich Johnston
2013-09-30  3:15 ` [PATCH 03/32] xfs: fix some minor sparse warnings Dave Chinner
2013-10-08 22:56   ` Eric Sandeen
2013-10-09 20:43     ` Dave Chinner
2013-09-30  3:15 ` Dave Chinner [this message]
2013-10-08 23:03   ` [PATCH 04/32] xfs: check magic numbers in dir3 leaf verifier first Eric Sandeen
2013-10-09 20:45     ` Dave Chinner
2013-10-09 20:50       ` Eric Sandeen
2013-09-30  3:15 ` [PATCH 05/32] xfs: ensure we copy buffer type in da btree root splits Dave Chinner
2013-10-08 23:06   ` Eric Sandeen
2013-10-18 16:49   ` Rich Johnston
2013-09-30  3:15 ` [PATCH 06/32] xfs: don't assert fail on bad inode numbers Dave Chinner
2013-10-08 23:09   ` Eric Sandeen
2013-09-30  3:15 ` [PATCH 07/32] xfs: dirent dtype presence is dependent on directory magic numbers Dave Chinner
2013-10-08 23:30   ` Eric Sandeen
2013-10-09 20:51     ` Dave Chinner
2013-10-09 20:57       ` Eric Sandeen
2013-10-18 22:38     ` Rich Johnston
2013-09-30  3:15 ` [PATCH 08/32] xfs: create a shared header file for format-related information Dave Chinner
2013-10-08 23:37   ` Eric Sandeen
2013-10-18 16:59   ` Rich Johnston
2013-10-18 22:40     ` Dave Chinner
2013-10-18 22:43       ` Rich Johnston
2013-10-22 18:07       ` Rich Johnston
2013-09-30  3:15 ` [PATCH 09/32] xfs: unify directory/attribute format definitions Dave Chinner
2013-10-14 20:44   ` Eric Sandeen
2013-10-18 20:32   ` Rich Johnston
2013-10-22 22:25     ` Dave Chinner
2013-09-30  3:15 ` [PATCH 10/32] xfs: split dquot buffer operations out Dave Chinner
2013-09-30  3:15 ` [PATCH 11/32] xfs: decouple inode and bmap btree header files Dave Chinner
2013-09-30  3:15 ` [PATCH 12/32] libxfs: unify xfs_btree.c with kernel code Dave Chinner
2013-09-30  3:15 ` [PATCH 13/32] libxfs: bmap btree owner swap support Dave Chinner
2013-09-30  3:15 ` [PATCH 14/32] libxfs: xfs_rtalloc.c becomes xfs_rtbitmap.c Dave Chinner
2013-09-30  3:15 ` [PATCH 15/32] libxfs: bring across inode buffer readahead verifier changes Dave Chinner
2013-09-30  3:15 ` [PATCH 16/32] libxfs: Minor cleanup and bug fix sync Dave Chinner
2013-09-30  3:15 ` [PATCH 17/32] db: separate out straight buffer IO from map based IO Dave Chinner
2013-09-30  3:15 ` [PATCH 18/32] db: rewrite bbmap to use xfs_buf_map Dave Chinner
2013-09-30  3:15 ` [PATCH 19/32] db: rewrite IO engine to use libxfs Dave Chinner
2013-09-30  3:15 ` [PATCH 20/32] db: introduce verifier support into set_cur Dave Chinner
2013-09-30  3:15 ` [PATCH 21/32] db: indicate if the CRC on a buffer is correct or not Dave Chinner
2013-09-30  3:15 ` [PATCH 22/32] db: verify and calculate inode CRCs Dave Chinner
2013-09-30  3:15 ` [PATCH 23/32] db: verify and calculate dquot CRCs Dave Chinner
2013-09-30  3:15 ` [PATCH 24/32] db: add a special directory buffer verifier Dave Chinner
2013-09-30  3:15 ` [PATCH 25/32] db: add a special attribute " Dave Chinner
2013-09-30  3:15 ` [PATCH 26/32] db: re-enable write support for v5 filesystems Dave Chinner
2013-09-30  3:15 ` [PATCH 27/32] libxfs: fix root inode handling inconsistencies Dave Chinner
2013-09-30  3:15 ` [PATCH 28/32] xfs_db: avoid libxfs buffer lookup warnings Dave Chinner
2013-09-30  3:15 ` [PATCH 29/32] libxfs: work around do_div() not handling 32 bit numerators Dave Chinner
2013-09-30  3:15 ` [PATCH 30/32] db: enable metadump on CRC filesystems Dave Chinner
2013-09-30  3:15 ` [PATCH 31/32] xfs: support larger inode clusters on v5 filesystems Dave Chinner
2013-09-30  3:15 ` [PATCH 32/32] xfsprogs: kill experimental warnings for " Dave Chinner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1380510944-8571-5-git-send-email-david@fromorbit.com \
    --to=david@fromorbit.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox