On Thu, Dec 03, 2020 at 05:12:24PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> The code that validates recovered extent-free intent items is kind of a
> mess -- it doesn't use the standard xfs type validators, and it doesn't
> check for things that it should. Fix the validator function to use the
> standard validation helpers and look for more types of obvious errors.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_extfree_item.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
> index 5e0f0b0a6c83..e5356ed879a0 100644
> --- a/fs/xfs/xfs_extfree_item.c
> +++ b/fs/xfs/xfs_extfree_item.c
> @@ -584,14 +584,13 @@ xfs_efi_validate_ext(
> struct xfs_mount *mp,
> struct xfs_extent *extp)
> {
> - xfs_fsblock_t startblock_fsb;
> + if (extp->ext_start + extp->ext_len <= extp->ext_start)
> + return false;
>
> - startblock_fsb = XFS_BB_TO_FSB(mp,
> - XFS_FSB_TO_DADDR(mp, extp->ext_start));
> - if (startblock_fsb == 0 ||
> - extp->ext_len == 0 ||
> - startblock_fsb >= mp->m_sb.sb_dblocks ||
> - extp->ext_len >= mp->m_sb.sb_agblocks)
> + if (!xfs_verify_fsbno(mp, extp->ext_start))
> + return false;
> +
> + if (!xfs_verify_fsbno(mp, extp->ext_start + extp->ext_len - 1))
> return false;
>
> return true;
>
