summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_iomap.c
diff options
context:
space:
mode:
authorDarrick J. Wong2017-12-22 22:14:34 +0100
committerDarrick J. Wong2018-01-02 19:16:32 +0100
commitb4d8ad7fd3a18e6d92d4ebe858185c704604a57d (patch)
tree6c26c75b1a436f78f53b285c3ab676ea3098831f /fs/xfs/xfs_iomap.c
parentxfs: quota: check result of register_shrinker() (diff)
downloadkernel-qcow2-linux-b4d8ad7fd3a18e6d92d4ebe858185c704604a57d.tar.gz
kernel-qcow2-linux-b4d8ad7fd3a18e6d92d4ebe858185c704604a57d.tar.xz
kernel-qcow2-linux-b4d8ad7fd3a18e6d92d4ebe858185c704604a57d.zip
xfs: fix s_maxbytes overflow problems
Fix some integer overflow problems if offset + count happen to be large enough to cause an integer overflow. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_iomap.c')
-rw-r--r--fs/xfs/xfs_iomap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 7ab52a8bc0a9..66e1edbfb2b2 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -1006,7 +1006,7 @@ xfs_file_iomap_begin(
}
ASSERT(offset <= mp->m_super->s_maxbytes);
- if ((xfs_fsize_t)offset + length > mp->m_super->s_maxbytes)
+ if (offset > mp->m_super->s_maxbytes - length)
length = mp->m_super->s_maxbytes - offset;
offset_fsb = XFS_B_TO_FSBT(mp, offset);
end_fsb = XFS_B_TO_FSB(mp, offset + length);