From 8c0bf88e1990d11fdc8e9d4647fbcfac123c4725 Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Mon, 22 Oct 2012 18:01:19 -0400
Subject: [PATCH] --- yaml --- r: 334699 b: refs/heads/master c:
 5de35e8d5c02d271c20e18337e01bc20e6ef472e h: refs/heads/master i:   334697:
 882afd584044ba2d33ee2139eac1e4f096a8eecc   334695:
 f9a358640b8be83c895f17c298fb839ef00b3175 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/mballoc.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 73574afc43eb..da398dd05b4c 100644
--- 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
index eb1e385d8080..f05d08e13366 100644
--- 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;