ext4: check for zero length extent explicitly
authorEryu Guan <guaneryu@gmail.com>
Thu, 14 May 2015 23:00:45 +0000 (19:00 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 14 May 2015 23:00:45 +0000 (19:00 -0400)
The following commit introduced a bug when checking for zero length extent

5946d08 ext4: check for overlapping extents in ext4_valid_extent_entries()

Zero length extent could pass the check if lblock is zero.

Adding the explicit check for zero length back.

Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
fs/ext4/extents.c

index d74e08029643d3e5eeb1f8a14d9a78c290549863..451b92a9958abb859ed5bf2d12f4b4327cbfdaac 100644 (file)
@@ -377,7 +377,7 @@ static int ext4_valid_extent(struct inode *inode, struct ext4_extent *ext)
        ext4_lblk_t lblock = le32_to_cpu(ext->ee_block);
        ext4_lblk_t last = lblock + len - 1;
 
-       if (lblock > last)
+       if (len == 0 || lblock > last)
                return 0;
        return ext4_data_block_valid(EXT4_SB(inode->i_sb), block, len);
 }