Patchwork ext3: Fix an overflow in ext3_trim_fs.

login
register
mail settings
Submitter Tao Ma
Date March 3, 2011, 2:58 p.m.
Message ID <1299164317-6400-1-git-send-email-tm@tao.ma>
Download mbox | patch
Permalink /patch/85291/
State Not Applicable
Headers show

Comments

Tao Ma - March 3, 2011, 2:58 p.m.
From: Tao Ma <boyu.mt@taobao.com>

In a bs=4096 volume, if we call FITRIM with the following parameter as
fstrim_range(start = 102400, len = 134144000, minlen = 10240), with the
following code:
if (len >= EXT3_BLOCKS_PER_GROUP(sb))
        len -= (EXT3_BLOCKS_PER_GROUP(sb) - first_block);
else
        last_block = first_block + len;

So if len < EXT3_BLOCKS_PER_GROUP while first_block + len >
EXT3_BLOCKS_PER_GROUP, last_block will be set to an overflow value
which exceeds EXT3_BLOCKS_PER_GROUP.

This patch fixes it and adjusts len and last_block accordingly.

Cc: Lukas Czerner <lczerner@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
 fs/ext3/balloc.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
Jan Kara - March 3, 2011, 11:40 p.m.
On Thu 03-03-11 22:58:37, Tao Ma wrote:
> From: Tao Ma <boyu.mt@taobao.com>
> 
> In a bs=4096 volume, if we call FITRIM with the following parameter as
> fstrim_range(start = 102400, len = 134144000, minlen = 10240), with the
> following code:
> if (len >= EXT3_BLOCKS_PER_GROUP(sb))
>         len -= (EXT3_BLOCKS_PER_GROUP(sb) - first_block);
> else
>         last_block = first_block + len;
> 
> So if len < EXT3_BLOCKS_PER_GROUP while first_block + len >
> EXT3_BLOCKS_PER_GROUP, last_block will be set to an overflow value
> which exceeds EXT3_BLOCKS_PER_GROUP.
> 
> This patch fixes it and adjusts len and last_block accordingly.
  Thanks. Merged.

								Honza

Patch

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 045995c..5e012fe 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -2129,10 +2129,15 @@  int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range)
 		if (free_blocks < minlen)
 			continue;
 
-		if (len >= EXT3_BLOCKS_PER_GROUP(sb))
-			len -= (EXT3_BLOCKS_PER_GROUP(sb) - first_block);
-		else
+		/*
+		 * For all the groups except the last one, last block will
+		 * always be EXT3_BLOCKS_PER_GROUP(sb), so we only need to
+		 * change it for the last group in which case first_block +
+		 * len < EXT3_BLOCKS_PER_GROUP(sb).
+		 */
+		if (first_block + len < EXT3_BLOCKS_PER_GROUP(sb))
 			last_block = first_block + len;
+		len -= last_block - first_block;
 
 		ret = ext3_trim_all_free(sb, group, first_block,
 					last_block, minlen);