leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: ext4: Prevent infinite loop in ext4fs_iterate_dir

Browse Source 
If the ext3 journal gets out of sync with what is written on disk, for
example because of an unexpected power cut, ext4fs_read_file can
return an all-zero directory entry.  In that case, ext4fs_iterate_dir
would infinite loop.

This patch detects when a directory entry's direntlen member is 0 and
returns a failure status, which breaks out of the infinite loop.  As a
result, U-Boot will not find files that may subsequently be recovered
when the journal is replayed.

This is better behaviour than hanging in an infinite loop, but as a
further improvement maybe U-Boot could interpret the ext3 journal and
actually find the unsynced entries.

Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Thomas Fitzsimmons 2015-11-18 12:42:53 -05:00 committed by Tom Rini
parent b4bd655493
commit 54d68e9333
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ext4/ext4_common.c
View File

@ -1920,6 +1920,11 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name,
if (status < 0) if (status < 0)
return 0; return 0;
if (dirent.direntlen == 0) {
printf("Failed to iterate over directory %s\n", name);
return 0;
}
if (dirent.namelen != 0) { if (dirent.namelen != 0) {
char filename[dirent.namelen + 1]; char filename[dirent.namelen + 1];
struct ext2fs_node *fdiro; struct ext2fs_node *fdiro;