diff options
| author |   Darrick J. Wong <darrick.wong@oracle.com> | 2018-05-31 09:07:20 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-06-01 09:00:16 -0700 |
| commit | a03f1641c7a6d4e88c6aae0cd3d52305cdb967a0 (patch) | |
| tree | ceecf2dfa644f0ffc630c08c651e9fbecf6c2754 /fs | |
| parent | xfs: xfs_rtword_t should be unsigned, not signed (diff) | |
| download | linux-dev-a03f1641c7a6d4e88c6aae0cd3d52305cdb967a0.tar.xz linux-dev-a03f1641c7a6d4e88c6aae0cd3d52305cdb967a0.zip | |
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 <darrick.wong@oracle.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_rtbitmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
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), |