Repairing: implement unknown entry type fix.

relan · Sep 15, 2018 · f9c0f1b · f9c0f1b
1 parent 53728e5
commit f9c0f1b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/libexfat/exfat.h b/libexfat/exfat.h
@@ -238,5 +238,7 @@ bool exfat_fix_invalid_vbr_checksum(const struct exfat* ef, void* sector,
 		uint32_t vbr_checksum);
 bool exfat_fix_invalid_node_checksum(const struct exfat* ef,
 		struct exfat_node* node);
+bool exfat_fix_unknown_entry(struct exfat* ef, struct exfat_node* dir,
+		const struct exfat_entry* entry, off_t offset);
 
 #endif /* ifndef EXFAT_H_INCLUDED */
diff --git a/libexfat/node.c b/libexfat/node.c
@@ -517,7 +517,8 @@ static int readdir(struct exfat* ef, struct exfat_node* parent,
 				break; /* deleted entry, ignore it */
 
 			exfat_error("unknown entry type %#hhx", entry.type);
-			return -EIO;
+			if (!EXFAT_REPAIR(unknown_entry, ef, parent, &entry, *offset))
+				return -EIO;
 		}
 		*offset += sizeof(entry);
 	}

diff --git a/libexfat/repair.c b/libexfat/repair.c
@@ -86,3 +86,17 @@ bool exfat_fix_invalid_node_checksum(const struct exfat* ef,
 	exfat_errors_fixed++;
 	return true;
 }
+
+bool exfat_fix_unknown_entry(struct exfat* ef, struct exfat_node* dir,
+		const struct exfat_entry* entry, off_t offset)
+{
+	struct exfat_entry deleted = *entry;
+
+	deleted.type &= ~EXFAT_ENTRY_VALID;
+	if (exfat_generic_pwrite(ef, dir, &deleted, sizeof(struct exfat_entry),
+			offset) != sizeof(struct exfat_entry))
+		return false;
+
+	exfat_errors_fixed++;
+	return true;
+}