summaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorMaurizio Lombardi <mlombard@redhat.com>2014-05-27 12:48:56 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-30 20:09:42 -0700
commitdc10f332a7fce531cd44fc5984286369a6bb71f0 (patch)
tree285c1f3ca7d4d6d3dc9936ade1742ee14e52f6f3 /fs/ext4
parent327d2822e72d2f81adde6f8a8e5b9003634ae35a (diff)
downloadlinux-3.10-dc10f332a7fce531cd44fc5984286369a6bb71f0.tar.gz
linux-3.10-dc10f332a7fce531cd44fc5984286369a6bb71f0.tar.bz2
linux-3.10-dc10f332a7fce531cd44fc5984286369a6bb71f0.zip
ext4: fix wrong assert in ext4_mb_normalize_request()
commit b5b60778558cafad17bbcbf63e0310bd3c68eb17 upstream. The variable "size" is expressed as number of blocks and not as number of clusters, this could trigger a kernel panic when using ext4 with the size of a cluster different from the size of a block. Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/mballoc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index fba960ee26d..16bb6591561 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3116,7 +3116,7 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
}
BUG_ON(start + size <= ac->ac_o_ex.fe_logical &&
start > ac->ac_o_ex.fe_logical);
- BUG_ON(size <= 0 || size > EXT4_CLUSTERS_PER_GROUP(ac->ac_sb));
+ BUG_ON(size <= 0 || size > EXT4_BLOCKS_PER_GROUP(ac->ac_sb));
/* now prepare goal request */