diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-06-21 23:26:57 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-06-24 11:56:36 -0700 |
| commit | f62cb48e43195f66c7a40bbfcf11531fc1ff8999 (patch) | |
| tree | 0239274fdf66eac61e3d914c21d9081ca66302c8 /fs/xfs/xfs_bmap_util.c | |
| parent | aafe12cee0b132824f5187987f8a3fb704b9f685 (diff) | |
| download | linux-f62cb48e43195f66c7a40bbfcf11531fc1ff8999.tar.gz linux-f62cb48e43195f66c7a40bbfcf11531fc1ff8999.tar.bz2 linux-f62cb48e43195f66c7a40bbfcf11531fc1ff8999.zip | |
xfs: don't allow insert-range to shift extents past the maximum offset
Zorro Lang reports that generic/485 blows an assert on a filesystem with
512 byte blocks. The test tries to fallocate a post-eof extent at the
maximum file size and calls insert range to shift the extents right by
two blocks. On a 512b block filesystem this causes startoff to overflow
the 54-bit startoff field, leading to the assert.
Therefore, always check the rightmost extent to see if it would overflow
prior to invoking the insert range machinery.
Reported-by: zlang@redhat.com
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=200137
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_bmap_util.c')
| -rw-r--r-- | fs/xfs/xfs_bmap_util.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index c195b9d857af..bb417156e3bf 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -1383,6 +1383,10 @@ xfs_insert_file_space( trace_xfs_insert_file_space(ip); + error = xfs_bmap_can_insert_extents(ip, stop_fsb, shift_fsb); + if (error) + return error; + error = xfs_prepare_shift(ip, offset); if (error) return error; |