45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
|
From b33e6fa8e4217bbfc41e6af266049f86b198156e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ionut Nicu <ioan.nicu.ext@nsn.com>
|
||
|
|
Date: Mon, 13 Jan 2014 12:00:08 +0100
|
||
|
|
Subject: [PATCH 2/2] ext4fs: fix "invalid extent block" error
|
||
|
|
|
||
|
|
For files where we actually have extent indexes following
|
||
|
|
an extent header (ext_block->eh_depth != 0), the do/while
|
||
|
|
loop from ext4fs_get_extent_block() does not select the
|
||
|
|
proper extent index structure.
|
||
|
|
|
||
|
|
For example, if we have:
|
||
|
|
|
||
|
|
ext_block->eh_depth = 1
|
||
|
|
ext_block->eh_entries = 1
|
||
|
|
fileblock = 0
|
||
|
|
index[0].ei_block = 0
|
||
|
|
|
||
|
|
the do/while loop will exit with i set to 0 and the
|
||
|
|
ext4fs_get_extent_block() function will return 0, even if
|
||
|
|
there was a valid extent index structure following the
|
||
|
|
header.
|
||
|
|
|
||
|
|
Signed-off-by: Ionut Nicu <ioan.nicu.ext@nsn.com>
|
||
|
|
Signed-off-by: Mathias Rulf <mathias.rulf@nsn.com>
|
||
|
|
---
|
||
|
|
fs/ext4/ext4_common.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
|
||
|
|
index 16b58ca1a6..50b904661d 100644
|
||
|
|
--- a/fs/ext4/ext4_common.c
|
||
|
|
+++ b/fs/ext4/ext4_common.c
|
||
|
|
@@ -1430,7 +1430,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block
|
||
|
|
i++;
|
||
|
|
if (i >= le16_to_cpu(ext_block->eh_entries))
|
||
|
|
break;
|
||
|
|
- } while (fileblock > le32_to_cpu(index[i].ei_block));
|
||
|
|
+ } while (fileblock >= le32_to_cpu(index[i].ei_block));
|
||
|
|
|
||
|
|
if (--i < 0)
|
||
|
|
return 0;
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|