Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae49eeec authored by Lukas Czerner's avatar Lukas Czerner Committed by Jan Kara
Browse files

ext3: Avoid underflow of in ext3_trim_fs() 



Currently if len argument in ext3_trim_fs() is smaller than one block,
the 'end' variable underflow. Avoid that by returning EINVAL if len is
smaller than file system block.

Also remove useless unlikely().

Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 7af11686

fs/ext3/balloc.c

+3 −2
Original line number Diff line number Diff line
@@ -2101,8 +2101,9 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range) 
	end = start + (range->len >> sb->s_blocksize_bits) - 1;

	minlen = range->minlen >> sb->s_blocksize_bits;



	if (unlikely(minlen > EXT3_BLOCKS_PER_GROUP(sb)) ||

	    unlikely(start >= max_blks))

	if (minlen > EXT3_BLOCKS_PER_GROUP(sb) ||

	    start >= max_blks ||

	    range->len < sb->s_blocksize)

		return -EINVAL;

	if (end >= max_blks)

		end = max_blks - 1;