diff options
| author | Tomas Racek <tracek@redhat.com> | 2012-08-14 10:35:04 +0200 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-08-16 16:42:52 -0500 |
| commit | 643bfc061c47e9c7661324a09fb0a0bc6601e5d6 (patch) | |
| tree | 7a4a47e6ccfe8b21efb99a438deb7369dff13ba3 | |
| parent | c4982110ae93d7575503feb81d15e93c0c5f393c (diff) | |
| download | linux-3.10-643bfc061c47e9c7661324a09fb0a0bc6601e5d6.tar.gz linux-3.10-643bfc061c47e9c7661324a09fb0a0bc6601e5d6.tar.bz2 linux-3.10-643bfc061c47e9c7661324a09fb0a0bc6601e5d6.zip | |
xfs: check for possible overflow in xfs_ioc_trim
If range.start or range.minlen is bigger than filesystem size, return
invalid value error. This fixes possible overflow in BTOBB macro when
passed value was nearly ULLONG_MAX.
Signed-off-by: Tomas Racek <tracek@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
| -rw-r--r-- | fs/xfs/xfs_discard.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c index f9c3fe304a1..69cf4fcde03 100644 --- a/fs/xfs/xfs_discard.c +++ b/fs/xfs/xfs_discard.c @@ -179,12 +179,14 @@ xfs_ioc_trim( * used by the fstrim application. In the end it really doesn't * matter as trimming blocks is an advisory interface. */ + if (range.start >= XFS_FSB_TO_B(mp, mp->m_sb.sb_dblocks) || + range.minlen > XFS_FSB_TO_B(mp, XFS_ALLOC_AG_MAX_USABLE(mp))) + return -XFS_ERROR(EINVAL); + start = BTOBB(range.start); end = start + BTOBBT(range.len) - 1; minlen = BTOBB(max_t(u64, granularity, range.minlen)); - if (XFS_BB_TO_FSB(mp, start) >= mp->m_sb.sb_dblocks) - return -XFS_ERROR(EINVAL); if (end > XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks) - 1) end = XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks)- 1; |