All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] xfs: check for possible overflow in xfs_ioc_trim
@ 2012-08-01 13:45 ` Tomas Racek
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Racek @ 2012-08-01 13:45 UTC (permalink / raw)
  To: linux-xfs
  Cc: lczerner, Tomas Racek, Ben Myers, Alex Elder,
	supporter:XFS FILESYSTEM, open list

If range.start points behind the filesystem, return invalid value error.
This fixes possible overflow in

start = BTOBB(range.start)

when range.start is nearly ULLONG_MAX.

Signed-off-by: Tomas Racek <tracek@redhat.com>
---
 fs/xfs/xfs_discard.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index f9c3fe3..33d367f 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -179,12 +179,13 @@ 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))
+		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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH v2] xfs: check for possible overflow in xfs_ioc_trim
@ 2012-08-01 13:45 ` Tomas Racek
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Racek @ 2012-08-01 13:45 UTC (permalink / raw)
  To: linux-xfs
  Cc: Alex Elder, open list, Tomas Racek, supporter:XFS FILESYSTEM,
	Ben Myers, lczerner

If range.start points behind the filesystem, return invalid value error.
This fixes possible overflow in

start = BTOBB(range.start)

when range.start is nearly ULLONG_MAX.

Signed-off-by: Tomas Racek <tracek@redhat.com>
---
 fs/xfs/xfs_discard.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index f9c3fe3..33d367f 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -179,12 +179,13 @@ 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))
+		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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] xfs: check for possible overflow in xfs_ioc_trim
  2012-08-01 13:45 ` Tomas Racek
@ 2012-08-08  7:22   ` Lukáš Czerner
  -1 siblings, 0 replies; 4+ messages in thread
From: Lukáš Czerner @ 2012-08-08  7:22 UTC (permalink / raw)
  To: Tomas Racek
  Cc: linux-xfs, lczerner, Ben Myers, Alex Elder,
	supporter:XFS FILESYSTEM, open list

On Wed, 1 Aug 2012, Tomas Racek wrote:

> Date: Wed,  1 Aug 2012 15:45:37 +0200
> From: Tomas Racek <tracek@redhat.com>
> To: linux-xfs@vger.kernel.org
> Cc: lczerner@redhat.com, Tomas Racek <tracek@redhat.com>,
>     Ben Myers <bpm@sgi.com>, Alex Elder <elder@kernel.org>,
>     "supporter:XFS FILESYSTEM" <xfs@oss.sgi.com>,
>     open list <linux-kernel@vger.kernel.org>
> Subject: [PATCH v2] xfs: check for possible overflow in xfs_ioc_trim
> 
> If range.start points behind the filesystem, return invalid value error.
> This fixes possible overflow in
> 
> start = BTOBB(range.start)
> 
> when range.start is nearly ULLONG_MAX.
> 
> Signed-off-by: Tomas Racek <tracek@redhat.com>

The fix looks good to me, but I have one comment bellow.

> ---
>  fs/xfs/xfs_discard.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
> index f9c3fe3..33d367f 100644
> --- a/fs/xfs/xfs_discard.c
> +++ b/fs/xfs/xfs_discard.c
> @@ -179,12 +179,13 @@ 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))
> +		return -XFS_ERROR(EINVAL);
> +
>  	start = BTOBB(range.start);
>  	end = start + BTOBBT(range.len) - 1;
>  	minlen = BTOBB(max_t(u64, granularity, range.minlen));

It seems that we have the same problem here with range.minlen. It
is highly unlikely and stupid from the user space to send minlen of
such size, but it is possible.

Thanks!
-Lukas

>  
> -	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;
>  
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] xfs: check for possible overflow in xfs_ioc_trim
@ 2012-08-08  7:22   ` Lukáš Czerner
  0 siblings, 0 replies; 4+ messages in thread
From: Lukáš Czerner @ 2012-08-08  7:22 UTC (permalink / raw)
  To: Tomas Racek
  Cc: Alex Elder, open list, supporter:XFS FILESYSTEM, linux-xfs,
	Ben Myers, lczerner

On Wed, 1 Aug 2012, Tomas Racek wrote:

> Date: Wed,  1 Aug 2012 15:45:37 +0200
> From: Tomas Racek <tracek@redhat.com>
> To: linux-xfs@vger.kernel.org
> Cc: lczerner@redhat.com, Tomas Racek <tracek@redhat.com>,
>     Ben Myers <bpm@sgi.com>, Alex Elder <elder@kernel.org>,
>     "supporter:XFS FILESYSTEM" <xfs@oss.sgi.com>,
>     open list <linux-kernel@vger.kernel.org>
> Subject: [PATCH v2] xfs: check for possible overflow in xfs_ioc_trim
> 
> If range.start points behind the filesystem, return invalid value error.
> This fixes possible overflow in
> 
> start = BTOBB(range.start)
> 
> when range.start is nearly ULLONG_MAX.
> 
> Signed-off-by: Tomas Racek <tracek@redhat.com>

The fix looks good to me, but I have one comment bellow.

> ---
>  fs/xfs/xfs_discard.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
> index f9c3fe3..33d367f 100644
> --- a/fs/xfs/xfs_discard.c
> +++ b/fs/xfs/xfs_discard.c
> @@ -179,12 +179,13 @@ 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))
> +		return -XFS_ERROR(EINVAL);
> +
>  	start = BTOBB(range.start);
>  	end = start + BTOBBT(range.len) - 1;
>  	minlen = BTOBB(max_t(u64, granularity, range.minlen));

It seems that we have the same problem here with range.minlen. It
is highly unlikely and stupid from the user space to send minlen of
such size, but it is possible.

Thanks!
-Lukas

>  
> -	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;
>  
> 

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-08  7:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-01 13:45 [PATCH v2] xfs: check for possible overflow in xfs_ioc_trim Tomas Racek
2012-08-01 13:45 ` Tomas Racek
2012-08-08  7:22 ` Lukáš Czerner
2012-08-08  7:22   ` Lukáš Czerner

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.