Skip to contentSkip to conversation

xfs: dabtree scrub needs to range-check level

PATCH In review Darrick J. Wong 2 participants 2 messages Mar 18, 2019 – Mar 19, 2019 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: dabtree scrub needs to range-check level

From: Darrick J. Wong <[email protected]>

Make sure scrub's dabtree iterator function checks that we're not going deeper in the stack than our cursor permits. Found by sparse.

---
 fs/xfs/scrub/dabtree.c |    5 +++++
 1 file changed, 5 insertions(+)
fs/xfs/scrub/dabtree.c +5 -0
index c6ab123b6051..5c6175d074e0 100644
@@ -604,6 +604,11 @@ xchk_da_btree(
 		/* Drill another level deeper. */
 		blkno = be32_to_cpu(key->before);
 		level++;
+		if (level >= XFS_DA_NODE_MAXDEPTH) {
+			/* Too deep! */
+			xchk_da_set_corrupt(&ds, level - 1);
+			break;
+		}
 		ds.tree_level--;
 		error = xchk_da_btree_block(&ds, level, blkno);
 		if (error)
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

Make sure scrub's dabtree iterator function checks that we're not going deeper in the stack than our cursor permits. Found by sparse.

---

Quoted 19 lines
 fs/xfs/scrub/dabtree.c |    5 +++++
 1 file changed, 5 insertions(+)
fs/xfs/scrub/dabtree.c +5 -0
index c6ab123b6051..5c6175d074e0 100644
@@ -604,6 +604,11 @@ xchk_da_btree(
 		/* Drill another level deeper. */
 		blkno = be32_to_cpu(key->before);
 		level++;
+		if (level >= XFS_DA_NODE_MAXDEPTH) {
+			/* Too deep! */
+			xchk_da_set_corrupt(&ds, level - 1);
+			break;
+		}
 		ds.tree_level--;
 		error = xchk_da_btree_block(&ds, level, blkno);
 		if (error)