---

yaml --- r: 142937 b: refs/heads/master c: 0f2ddca h: refs/heads/master i: 142935: 83b1457 v: v3
git-mirror · Apr 7, 2009 · 343a557 · 343a557
1 parent 668fe5f
commit 343a557
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e44543b83bf4ab84dc6bd5b88158c78b1ed1c208
+refs/heads/master: 0f2ddca66d70c8ccba7486cf2d79c6b60e777abd
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
@@ -2508,6 +2508,15 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 	if (EXT4_BLOCKS_PER_GROUP(sb) == 0)
 		goto cantfind_ext4;
 
+	/* check blocks count against device size */
+	blocks_count = sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits;
+	if (blocks_count && ext4_blocks_count(es) > blocks_count) {
+		printk(KERN_WARNING "EXT4-fs: bad geometry: block count %llu "
+		       "exceeds size of device (%llu blocks)\n",
+		       ext4_blocks_count(es), blocks_count);
+		goto failed_mount;
+	}
+
         /*
          * It makes no sense for the first data block to be beyond the end
          * of the filesystem.