diff options
| author | Eryu Guan <guaneryu@gmail.com> | 2015-05-15 02:00:45 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-07 02:32:12 +0300 |
| commit | 93fa5e650858847f56d90bfdabb18d87bc859663 (patch) | |
| tree | 87a218c47f1d8f00571830722c16ddb112451a50 /fs/ext4 | |
| parent | b7314518be7eae2f25ca7c07986b8d970595d0f7 (diff) | |
| download | linux-93fa5e650858847f56d90bfdabb18d87bc859663.tar.xz | |
ext4: check for zero length extent explicitly
commit 2f974865ffdfe7b9f46a9940836c8b167342563d upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/extents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 0eed964f696e..2da63ab7c416 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -321,7 +321,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); } |