summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@cisco.com>2015-11-18 20:42:53 +0300
committerDongjin Kim <tobetter@gmail.com>2020-02-10 16:44:41 +0300
commite254a253459b2b4831d285d2e5eec6c753763482 (patch)
treeaa718a40e329e27165b8ac06f34628f274aa9655
parent9732cd897daff5dc4a50510a44489fa47f304aa6 (diff)
downloadu-boot-e254a253459b2b4831d285d2e5eec6c753763482.tar.xz
fs: ext4: Prevent infinite loop in ext4fs_iterate_dir
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>
-rw-r--r--fs/ext4/ext4_common.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 7d10009547..e5f498597f 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -1919,6 +1919,11 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name,
if (status < 0)
return 0;
+ if (dirent.direntlen == 0) {
+ printf("Failed to iterate over directory %s\n", name);
+ return 0;
+ }
+
if (dirent.namelen != 0) {
char filename[dirent.namelen + 1];
struct ext2fs_node *fdiro;