xfs: check magic numbers in dir3 leaf verifier first
PATCH 1/1 xfs: check magic numbers in dir3 leaf verifier first
From: Dave Chinner <[email protected]>
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.
--- fs/xfs/xfs_dir2_leaf.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
fs/xfs/xfs_dir2_leaf.c +14 -7
@@ -165,6 +165,7 @@ xfs_dir3_leaf_check_int( (char *)&ents[hdr->count] > (char *)xfs_dir2_leaf_bests_p(ltp))return false; +/* Check hash value order, count stale entries. */ for (i = stale =0 ; i < hdr->count; i++) {if (i +1 < hdr->count) {
@@ -180,6 +181,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,
@@ -191,24 +197,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_be32 (magic))return false; } + +xfs_dir3_leaf_hdr_from_disk (&leafhdr, leaf);return xfs_dir3_leaf_check_int (mp, &leafhdr, leaf); }
Signature · 6 lines
1.8.3.2 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 1/1 xfs: check magic numbers in dir3 leaf verifier first
xfs: check magic numbers in dir3 leaf verifier first
From: Dave Chinner <[email protected]>
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.
---
v2: magic number size is 16 bits, not 32 bits. Was only wrong for v4 filesystem checking, xfstests/204 triggered failure.
fs/xfs/xfs_dir2_leaf.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
fs/xfs/xfs_dir2_leaf.c +14 -7
@@ -165,6 +165,7 @@ xfs_dir3_leaf_check_int( (char *)&ents[hdr->count] > (char *)xfs_dir2_leaf_bests_p(ltp))return false; +/* Check hash value order, count stale entries. */ for (i = stale =0 ; i < hdr->count; i++) {if (i +1 < hdr->count) {
@@ -180,6 +181,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,
@@ -191,24 +197,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); }
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
fs/xfs/xfs_dir2_leaf.c xfs_dir3_leaf_check_int( · line 169
Quoted 6 lines
fs/xfs/xfs_dir2_leaf.c +1
-0@@ -165,6 +165,7 @@ xfs_dir3_leaf_check_int( (char *)&ents[hdr->count] > (char *)xfs_dir2_leaf_bests_p(ltp))return false; +/* Check hash value order, count stale entries. */
spurious new line..
Quoted 8 lines
fs/xfs/xfs_dir2_leaf.c +4
-0if (xfs_sb_version_hascrc (&mp->m_sb)) {struct xfs_dir3_leaf_hdr *leaf3 = bp->b_addr; +__uint16_t magic3; + magic3 = (magic ==XFS_DIR2_LEAF1_MAGIC ) ?XFS_DIR3_LEAF1_MAGIC + :XFS_DIR3_LEAFN_MAGIC ; +if (leaf3->info.hdr.magic !=cpu_to_be16 (magic3))
fs/xfs/xfs_dir2_leaf.c xfs_dir3_leaf_verify( · line 216
Quoted 10 lines
fs/xfs/xfs_dir2_leaf.c +2
-1+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; }
Looks good but I wonder if something like this should be factored into a separate helper in the long run.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Dave Chinner
xfs: check magic numbers in dir3 leaf verifier first
From: Dave Chinner <[email protected]>
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.
Quoted 4 lines
Check the magic numbers direct from the buffer before decoding the header.
Signed-off-by Dave Chinner <[email protected]>
Cleaned up the spurious newline and applied.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
This has been committed.
Thanks
--Rich
commit 36bca8993f52be84f31c476449ca1527d62e16e1
Author: Dave Chinner <[email protected]> Date: Mon Sep 30 03:15:16 2013 +0000
xfs: check magic numbers in dir3 leaf verifier first
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs