2012-08-01 13:46:09

by Tomas Racek

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 <[email protected]>
---
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

2012-08-08 07:22:13

by Lukas Czerner

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

On Wed, 1 Aug 2012, Tomas Racek wrote:

> Date: Wed, 1 Aug 2012 15:45:37 +0200
> From: Tomas Racek <[email protected]>
> To: [email protected]
> Cc: [email protected], Tomas Racek <[email protected]>,
> Ben Myers <[email protected]>, Alex Elder <[email protected]>,
> "supporter:XFS FILESYSTEM" <[email protected]>,
> open list <[email protected]>
> 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 <[email protected]>

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