ext2: Fix _ext2_dir_read() skipping last entries in a directory

Fixes phoenix-rtos/phoenix-rtos-project#581 DONE: RTOS-322
phoenix-rtos · Jan 24, 2023 · d5f8d30 · d5f8d30
1 parent 73b4f1b
commit d5f8d30
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ext2/dir.c b/ext2/dir.c
@@ -129,9 +129,14 @@ int _ext2_dir_read(ext2_t *fs, ext2_obj_t *dir, offs_t offs, struct dirent *res,
 	if ((entry = (ext2_dirent_t *)malloc(len)) == NULL)
 		return -ENOMEM;
 
-	if ((ret = _ext2_file_read(fs, dir, offs, (char *)entry, len)) != len) {
+	if ((ret = _ext2_file_read(fs, dir, offs, (char *)entry, len)) < 0) {
 		free(entry);
-		return (ret < 0) ? (int)ret : -ENOENT;
+		return ret;
+	}
+
+	if (((size_t)ret < sizeof(ext2_dirent_t)) || ((size_t)ret < sizeof(ext2_dirent_t) + entry->len)) {
+		free(entry);
+		return -ENOENT;
 	}
 
 	if (!entry->len) {