---

yaml --- r: 334699 b: refs/heads/master c: 5de35e8 h: refs/heads/master i: 334697: 882afd5 334695: f9a3586 v: v3
git-mirror · Oct 22, 2012 · 8c0bf88 · 8c0bf88
1 parent 7da5488
commit 8c0bf88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79f1ba49569e5aec919b653c55b03274c2331701
+refs/heads/master: 5de35e8d5c02d271c20e18337e01bc20e6ef472e
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
@@ -4990,8 +4990,9 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
 	minlen = EXT4_NUM_B2C(EXT4_SB(sb),
 			      range->minlen >> sb->s_blocksize_bits);
 
-	if (unlikely(minlen > EXT4_CLUSTERS_PER_GROUP(sb)) ||
-	    unlikely(start >= max_blks))
+	if (minlen > EXT4_CLUSTERS_PER_GROUP(sb) ||
+	    start >= max_blks ||
+	    range->len < sb->s_blocksize)
 		return -EINVAL;
 	if (end >= max_blks)
 		end = max_blks - 1;