diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-12-05 12:36:56 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-12-05 12:36:56 +1100 |
| commit | 356a3225222e5bc4df88aef3419fb6424f18ab69 (patch) | |
| tree | ed4f652f393d68b95744b29a38f6db3df3d5abae /fs/xfs/libxfs | |
| parent | bb3be7e7c1c18e1b141d4cadeb98cc89ecf78099 (diff) | |
| download | op-kernel-dev-356a3225222e5bc4df88aef3419fb6424f18ab69.zip op-kernel-dev-356a3225222e5bc4df88aef3419fb6424f18ab69.tar.gz | |
xfs: complain if we don't get nextents bmap records
When reading into memory all extents of a btree-format inode fork,
complain if the number of extents we find is not the same as the number
of extents reported in the inode core. This is needed to stop an IO
action from accessing the garbage areas of the in-core fork.
[dchinner: removed redundant assert]
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/libxfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 23aa70b..829ad63 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -1377,8 +1377,9 @@ xfs_bmap_read_extents( return error; block = XFS_BUF_TO_BLOCK(bp); } + if (i != XFS_IFORK_NEXTENTS(ip, whichfork)) + return -EFSCORRUPTED; ASSERT(i == xfs_iext_count(ifp)); - ASSERT(i == XFS_IFORK_NEXTENTS(ip, whichfork)); XFS_BMAP_TRACE_EXLIST(ip, i, whichfork); return 0; error0: |
