Re: [PATCH 2/2] xfs: add missing cursor stat checks after xfs_btree_delete

["Darrick J. Wong" <djwong@kernel.org>]

On Tue, Oct 13, 2026 at 04:07:47PM -0500, Eric Sandeen wrote:
> Three xfs_btree_delete() calls in xfs_ialloc.c fail to check the status
> returns indicating whether a record was actually deleted. If the cursor
> was pointing to something that couldn't be deleted or didn't exist,
> something has gone wrong, so mark the fs as sick and return
> EFSCORRUPTED.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Looks good too!
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/libxfs/xfs_ialloc.c | 27 ++++++++++++++++++++++-----
>  1 file changed, 22 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
> index 17699f7c009f..bb6e684f5467 100644
> --- a/fs/xfs/libxfs/xfs_ialloc.c
> +++ b/fs/xfs/libxfs/xfs_ialloc.c
> @@ -1626,12 +1626,20 @@ xfs_dialloc_ag(
>  	 */
>  	rec.ir_free &= ~XFS_INOBT_MASK(offset);
>  	rec.ir_freecount--;
> -	if (rec.ir_freecount)
> +	if (rec.ir_freecount) {
>  		error = xfs_inobt_update(cur, &rec);
> -	else
> +		if (error)
> +			goto error_cur;
> +	} else {
>  		error = xfs_btree_delete(cur, &i);
> -	if (error)
> -		goto error_cur;
> +		if (error)
> +			goto error_cur;
> +		if (XFS_IS_CORRUPT(mp, i != 1)) {
> +			xfs_btree_mark_sick(cur);
> +			error = -EFSCORRUPTED;
> +			goto error_cur;
> +		}
> +	}
>  
>  	/*
>  	 * The finobt has now been updated appropriately. We haven't updated the
> @@ -2164,6 +2172,11 @@ xfs_difree_inobt(
>  				__func__, error);
>  			goto error0;
>  		}
> +		if (XFS_IS_CORRUPT(mp, i != 1)) {
> +			xfs_btree_mark_sick(cur);
> +			error = -EFSCORRUPTED;
> +			goto error0;
> +		}
>  
>  		error = xfs_difree_inode_chunk(tp, pag, &rec);
>  		if (error)
> @@ -2290,7 +2303,11 @@ xfs_difree_finobt(
>  		error = xfs_btree_delete(cur, &i);
>  		if (error)
>  			goto error;
> -		ASSERT(i == 1);
> +		if (XFS_IS_CORRUPT(mp, i != 1)) {
> +			xfs_btree_mark_sick(cur);
> +			error = -EFSCORRUPTED;
> +			goto error;
> +		}
>  	} else {
>  		error = xfs_inobt_update(cur, &rec);
>  		if (error)
> -- 
> 2.55.0
> 
>