Skip to contentSkip to conversation

ext4fs: fix "invalid extent block" error

PATCH New Ionut Nicu 2 participants 2 messages Jan 13, 2014 – Jan 20, 2014 ext4 file system

lore
Share & tools
lore

Ionut Nicu

author
#0 lore raw

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.

---
 fs/ext4/ext4_common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ext4/ext4_common.c +1 -1
index 37b6c46..e543478 100644
@@ -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;
Signature · 1 line
1.7.1
#1 lore raw

PATCH 2/2 ext4fs: fix "invalid extent block" error

Quoted 12 lines · Ionut Nicu

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

Quoted 7 lines

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.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140120/3fb842b7/attachment.pgp>