[PATCH v4] xfs: check for possible overflow in xfs_ioc_trim

[PATCH v4] xfs: check for possible overflow in xfs_ioc_trim

[Tomas Racek]

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>
---
 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 f9c3fe3..69cf4fc 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;
 
-- 
1.7.7.6

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH v4] xfs: check for possible overflow in xfs_ioc_trim

[Dave Chinner]

On Tue, Aug 14, 2012 at 10:35:04AM +0200, Tomas Racek wrote:
> 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>

looks ok to me.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH v4] xfs: check for possible overflow in xfs_ioc_trim

[Tomas Racek]

Forwarding to maintainers.

----- Original Message -----
> On Tue, Aug 14, 2012 at 10:35:04AM +0200, Tomas Racek wrote:
> > 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>
> 
> looks ok to me.
> 
> Reviewed-by: Dave Chinner <dchinner@redhat.com>
> --
> Dave Chinner
> david@fromorbit.com
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH v4] xfs: check for possible overflow in xfs_ioc_trim

[Ben Myers]

On Wed, Aug 15, 2012 at 08:23:32AM -0400, Tomas Racek wrote:
> Forwarding to maintainers.

Thanks Tomas.  We'll get this sorted.

Regards,
	Ben

> 
> ----- Original Message -----
> > On Tue, Aug 14, 2012 at 10:35:04AM +0200, Tomas Racek wrote:
> > > 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>
> > 
> > looks ok to me.
> > 
> > Reviewed-by: Dave Chinner <dchinner@redhat.com>
> > --
> > Dave Chinner
> > david@fromorbit.com
> > 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs