From: Darrick J. Wong Date: Thu, 31 May 2018 16:07:20 +0000 (-0700) Subject: xfs: xfs_rtbuf_get should check the bmapi_read results X-Git-Tag: Ubuntu-5.13.0-19.19~10895^2~17 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a03f1641c7a6d4e88c6aae0cd3d52305cdb967a0;p=mirror_ubuntu-jammy-kernel.git xfs: xfs_rtbuf_get should check the bmapi_read results The xfs_rtbuf_get function should check the block mapping it gets back from bmapi_read. If there are no mappings or the mapping isn't a real extent, we should return -EFSCORRUPTED rather than trying to read a garbage value. We also require realtime bitmap blocks to be real, written allocations. Signed-off-by: Darrick J. Wong Reviewed-by: Allison Henderson Reviewed-by: Bill O'Donnell --- diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c index 106be2d0bb88..7712f282d172 100644 --- a/fs/xfs/libxfs/xfs_rtbitmap.c +++ b/fs/xfs/libxfs/xfs_rtbitmap.c @@ -90,6 +90,9 @@ xfs_rtbuf_get( if (error) return error; + if (nmap == 0 || !xfs_bmap_is_real_extent(&map)) + return -EFSCORRUPTED; + ASSERT(map.br_startblock != NULLFSBLOCK); error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, XFS_FSB_TO_DADDR(mp, map.br_startblock),