xfs: fix btree scrub checking with regards to root-in-inode
PATCH 1/1 xfs: fix btree scrub checking with regards to root-in-inode
From: Darrick J. Wong <[email protected]>
In xchk_btree_check_owner, we can be passed a null buffer pointer. This should only happen for the root of a root-in-inode btree type, but we should program defensively in case the btree cursor state ever gets screwed up and we get a null buffer anyway.
Coverity-id: 1438713
Signed-off-by Darrick J. Wong <[email protected]>
--- fs/xfs/scrub/btree.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
fs/xfs/scrub/btree.c +10 -1
@@ -481,8 +481,17 @@ xchk_btree_check_owner(struct xfs_btree_cur *cur = bs->cur;struct check_owner *co; -if ((cur->bc_flags &XFS_BTREE_ROOT_IN_INODE ) && bp ==NULL ) +/* +* In theory, xfs_btree_get_block should only give us a null buffer +* pointer for the root of a root-in-inode btree type, but we need +* to check defensively here in case the cursor state is also screwed +* up. +*/ +if (bp ==NULL ) { +if (!(cur->bc_flags &XFS_BTREE_ROOT_IN_INODE )) +xchk_btree_set_corrupt (bs->sc, bs->cur, level);return 0 ; + }/* * We want to cross-reference each btree block with the bnobt
Quoted 10 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
In
xchk_btree_check_owner, we can be passed a null buffer pointer. This should only happen for the root of a root-in-inode btree type, but we should program defensively in case the btree cursor state ever gets screwed up and we get a null buffer anyway.Coverity-id: 1438713
Signed-off-by Darrick J. Wong <[email protected]>---
Reviewed-by Brian Foster <[email protected]>
Quoted 26 lines
fs/xfs/scrub/btree.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)fs/xfs/scrub/btree.c +10
-1@@ -481,8 +481,17 @@ xchk_btree_check_owner(struct xfs_btree_cur *cur = bs->cur;struct check_owner *co; -if ((cur->bc_flags &XFS_BTREE_ROOT_IN_INODE ) && bp ==NULL ) +/* +* In theory, xfs_btree_get_block should only give us a null buffer +* pointer for the root of a root-in-inode btree type, but we need +* to check defensively here in case the cursor state is also screwed +* up. +*/ +if (bp ==NULL ) { +if (!(cur->bc_flags &XFS_BTREE_ROOT_IN_INODE )) +xchk_btree_set_corrupt (bs->sc, bs->cur, level);return 0 ; + }/* * We want to cross-reference each btree block with the bnobt