Commit 67457eb0 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: refactor data device extent validation 



Refactor all the open-coded validation of non-static data device extents
into a single helper.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 4b80ac64

fs/xfs/libxfs/xfs_bmap.c

+2 −6
Original line number Diff line number Diff line
@@ -6242,12 +6242,8 @@ xfs_bmap_validate_extent( 
		if (!xfs_verify_rtbno(mp, endfsb))

			return __this_address;

	} else {

		if (!xfs_verify_fsbno(mp, irec->br_startblock))

			return __this_address;

		if (!xfs_verify_fsbno(mp, endfsb))

			return __this_address;

		if (XFS_FSB_TO_AGNO(mp, irec->br_startblock) !=

		    XFS_FSB_TO_AGNO(mp, endfsb))

		if (!xfs_verify_fsbext(mp, irec->br_startblock,

					   irec->br_blockcount))

			return __this_address;

	}

	if (irec->br_state != XFS_EXT_NORM && whichfork != XFS_DATA_FORK)

fs/xfs/libxfs/xfs_types.c

+23 −0
Original line number Diff line number Diff line
@@ -61,6 +61,29 @@ xfs_verify_fsbno( 
	return xfs_verify_agbno(mp, agno, XFS_FSB_TO_AGBNO(mp, fsbno));

}



/*

 * Verify that a data device extent is fully contained inside the filesystem,

 * does not cross an AG boundary, and does not point at static metadata.

 */

bool

xfs_verify_fsbext(

	struct xfs_mount	*mp,

	xfs_fsblock_t		fsbno,

	xfs_fsblock_t		len)

{

	if (fsbno + len <= fsbno)

		return false;



	if (!xfs_verify_fsbno(mp, fsbno))

		return false;



	if (!xfs_verify_fsbno(mp, fsbno + len - 1))

		return false;



	return  XFS_FSB_TO_AGNO(mp, fsbno) ==

		XFS_FSB_TO_AGNO(mp, fsbno + len - 1);

}



/* Calculate the first and last possible inode number in an AG. */

void

xfs_agino_range(

fs/xfs/libxfs/xfs_types.h

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ xfs_agblock_t xfs_ag_block_count(struct xfs_mount *mp, xfs_agnumber_t agno); 
bool xfs_verify_agbno(struct xfs_mount *mp, xfs_agnumber_t agno,

		xfs_agblock_t agbno);

bool xfs_verify_fsbno(struct xfs_mount *mp, xfs_fsblock_t fsbno);

bool xfs_verify_fsbext(struct xfs_mount *mp, xfs_fsblock_t fsbno,

		xfs_fsblock_t len);



void xfs_agino_range(struct xfs_mount *mp, xfs_agnumber_t agno,

		xfs_agino_t *first, xfs_agino_t *last);

fs/xfs/scrub/bmap.c

+1 −4
Original line number Diff line number Diff line
@@ -359,10 +359,7 @@ xchk_bmap_iextent( 
		xchk_fblock_set_corrupt(info->sc, info->whichfork,

				irec->br_startoff);

	if (!info->is_rt &&

	    (!xfs_verify_fsbno(mp, irec->br_startblock) ||

	     !xfs_verify_fsbno(mp, end) ||

	     XFS_FSB_TO_AGNO(mp, irec->br_startblock) !=

				XFS_FSB_TO_AGNO(mp, end)))

	    !xfs_verify_fsbext(mp, irec->br_startblock, irec->br_blockcount))

		xchk_fblock_set_corrupt(info->sc, info->whichfork,

				irec->br_startoff);

fs/xfs/xfs_bmap_item.c

+1 −10
Original line number Diff line number Diff line
@@ -448,16 +448,7 @@ xfs_bui_validate( 
	if (bmap->me_startoff + bmap->me_len <= bmap->me_startoff)

		return false;



	if (bmap->me_startblock + bmap->me_len <= bmap->me_startblock)

		return false;



	if (!xfs_verify_fsbno(mp, bmap->me_startblock))

		return false;



	if (!xfs_verify_fsbno(mp, bmap->me_startblock + bmap->me_len - 1))

		return false;



	return true;

	return xfs_verify_fsbext(mp, bmap->me_startblock, bmap->me_len);

}



/*