Skip to contentSkip to conversation

xfs: check da node block pad field during scrub

PATCH Superseded Yuto Ohnuki 2 participants 3 messages Apr 4 – Apr 8 XFS filesystem

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: check da node block pad field during scrub

The da node block header (xfs_da3_node_hdr) contains a __pad32 field that should always be zero. Add a check for this during directory and attribute btree scrubbing so that non-zero padding is flagged as corruption.

---
 fs/xfs/scrub/dabtree.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
fs/xfs/scrub/dabtree.c +6 -1
index 1a71d36898b1..73d5a3bd936a 100644
@@ -454,7 +454,12 @@ xchk_da_btree_block(
 			}
 		}
 
-		/* XXX: Check hdr3.pad32 once we know how to fix it. */
+		if (xfs_has_crc(ip->i_mount)) {
+			struct xfs_da3_node_hdr *nodehdr3 = blk->bp->b_addr;
+
+			if (be32_to_cpu(nodehdr3->__pad32) != 0)
+				xchk_da_set_corrupt(ds, level);
+		}
 		break;
 	default:
 		xchk_da_set_corrupt(ds, level);
Signature · 8 lines
2.50.1




Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284

Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705
#1 lore raw
Quoted 15 lines · Yuto Ohnuki

The da node block header (xfs_da3_node_hdr) contains a __pad32 field that should always be zero. Add a check for this during directory and attribute btree scrubbing so that non-zero padding is flagged as corruption.

---
 fs/xfs/scrub/dabtree.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
fs/xfs/scrub/dabtree.c +0 -0
index 1a71d36898b1..73d5a3bd936a 100644

fs/xfs/scrub/dabtree.c xchk_da_btree_block( · line 457

Quoted 4 lines
fs/xfs/scrub/dabtree.c +0 -1
@@ -454,7 +454,12 @@ xchk_da_btree_block(
 			}
 		}
 
-		/* XXX: Check hdr3.pad32 once we know how to fix it. */

Same question as the previous patch -- does xfs_da3_node_create actually zero out the pad field?

fs/xfs/scrub/dabtree.c xchk_da_btree_block( · line 461

Quoted 5 lines
fs/xfs/scrub/dabtree.c +5 -0
+		if (xfs_has_crc(ip->i_mount)) {
+			struct xfs_da3_node_hdr *nodehdr3 = blk->bp->b_addr;
+
+			if (be32_to_cpu(nodehdr3->__pad32) != 0)
+				xchk_da_set_corrupt(ds, level);

and same comment about how you can only set xchk_da_set_preen if old kernels were ok with nonzero __pad32.

--D

Quoted 17 lines
fs/xfs/scrub/dabtree.c +1 -0
+		}
 		break;
 	default:
 		xchk_da_set_corrupt(ds, level);
Signature · 8 lines
2.50.1




Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284

Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705
#2 lore raw

On Mon, Apr 06, 2026 at 08:23:04AM -0700, Darrick J. Wong wrote:

Thank you for reviewing this patch as well.

Quoted 2 lines

Same question as the previous patch -- does xfs_da3_node_create actually zero out the pad field?

Yes, xfs_da3_node_create already does
memset(hdr3, 0, sizeof(struct xfs_da3_node_hdr)) which covers __pad32.

Quoted 5 lines

and same comment about how you can only set xchk_da_set_preen if old kernels were ok with nonzero __pad32.

--D

Understood. I'll switch to xchk_da_set_preen as well.

I'll send a v2 with this change.

Thanks,
Yuto

Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284

Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705