From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id q79Nm3ds240707 for ; Thu, 9 Aug 2012 18:48:03 -0500 Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id ttS5JTr7rZ7oeTh1 for ; Thu, 09 Aug 2012 16:48:01 -0700 (PDT) Date: Fri, 10 Aug 2012 09:47:59 +1000 From: Dave Chinner Subject: Re: [PATCH v3] xfs: check for possible overflow in xfs_ioc_trim Message-ID: <20120809234758.GE2877@dastard> References: <1344503229-13022-1-git-send-email-tracek@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1344503229-13022-1-git-send-email-tracek@redhat.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: Tomas Racek Cc: lczerner@redhat.com, Ben Myers , Alex Elder , "supporter:XFS FILESYSTEM" [ Trimmed lkml from cc list. There's no need to cc lkml on XFS specific stuff. ] [ Trimmed linux-xfs@vger.kernel.org as that is not a list any XFS developer is subscribed to. ] On Thu, Aug 09, 2012 at 11:07:09AM +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 > --- > 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..4e07a56 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, mp->m_sb.sb_dblocks)) > + return -XFS_ERROR(EINVAL); That's not correct for minlen. The maximum minlen we can support is the length of the largest freespace extent in the filesystem, and that is limited to the size of an AG. i.e. XFS_FSB_TO_B(mp, XFS_ALLOC_AG_MAX_USABLE(mp)) Cheers, Dave. -- Dave Chinner david@fromorbit.com _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs