* [U-Boot] [PATCH 2/2] ext4fs: fix "invalid extent block" error
@ 2014-01-13 11:00 Ionut Nicu
2014-01-20 22:59 ` [U-Boot] [U-Boot,2/2] " Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Ionut Nicu @ 2014-01-13 11:00 UTC (permalink / raw)
To: u-boot
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 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 37b6c46..e543478 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;
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [U-Boot,2/2] ext4fs: fix "invalid extent block" error
2014-01-13 11:00 [U-Boot] [PATCH 2/2] ext4fs: fix "invalid extent block" error Ionut Nicu
@ 2014-01-20 22:59 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2014-01-20 22:59 UTC (permalink / raw)
To: u-boot
On Mon, Jan 13, 2014 at 12:00:08PM +0100, Ionut Nicu wrote:
> 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>
Applied to u-boot/master, thanks!
--
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-20 22:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-13 11:00 [U-Boot] [PATCH 2/2] ext4fs: fix "invalid extent block" error Ionut Nicu
2014-01-20 22:59 ` [U-Boot] [U-Boot,2/2] " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).