Commit 425fa410 authored by Tao Ma's avatar Tao Ma Committed by Jan Kara

ext3: Fix an overflow in ext3_trim_fs.

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: default avatarTao Ma <boyu.mt@taobao.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 3c26bdb4
...@@ -2127,10 +2127,15 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range) ...@@ -2127,10 +2127,15 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range)
if (free_blocks < minlen) if (free_blocks < minlen)
continue; continue;
if (len >= EXT3_BLOCKS_PER_GROUP(sb)) /*
len -= (EXT3_BLOCKS_PER_GROUP(sb) - first_block); * For all the groups except the last one, last block will
else * 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; last_block = first_block + len;
len -= last_block - first_block;
ret = ext3_trim_all_free(sb, group, first_block, ret = ext3_trim_all_free(sb, group, first_block,
last_block, minlen); last_block, minlen);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment