diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-25 10:31:48 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-25 10:38:27 +0200 |
commit | 400b4e2bb3e1f4567ce794b369f3b4b7e8e08ed1 (patch) | |
tree | eb45fcaff17e74fc18e61be16120a45313ddcd6c /fs/ext4/ext4_common.c | |
parent | 6414f6991028f20e3f44aead8759d325bd9fe201 (diff) | |
download | barebox-400b4e2bb3e1f4567ce794b369f3b4b7e8e08ed1.tar.gz barebox-400b4e2bb3e1f4567ce794b369f3b4b7e8e08ed1.tar.xz |
fs: ext4: fix "invalid extent block" error
From U-Boot commit:
| commit b5bbac1a9b07016602559ff483df265fef6c1f83
| Author: Ionut Nicu <ioan.nicu.ext@nsn.com>
| Date: Mon Jan 13 12:00:08 2014 +0100
|
| 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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs/ext4/ext4_common.c')
-rw-r--r-- | fs/ext4/ext4_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index ceb965f492..5bff86897c 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -60,7 +60,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block(struct ext2_data *data i++; if (i >= le32_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; |