apfs/apfsprogs
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfsprogs.git synced 2026-08-18 02:19:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

apfsck: allow a single leaked block in the omap

Browse Source 
For reasons I ignore, some ios image volumes seem to have an orphaned
extended snap metadata block. It's listed in the volume's object map,
but it's not referenced in any of the snapshots as far as I can see.
Allow this for now, maybe I'll make sense of it at some point.

Signed-off-by: Ernesto A. Fernández <ernesto@corellium.com>
This commit is contained in:
Ernesto A. Fernández
2022-08-22 20:09:52 -03:00
parent 5bad1e2d07
commit 12731e61f4
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apfsck/btree.c
+20 -2
View File
@@ -598,12 +598,29 @@ static void free_omap_record_list(struct htable_entry *entry)
{
struct omap_record_list *list = (struct omap_record_list *)entry;
struct omap_record *curr_rec = list->o_records;
int unseen = 0;
while (curr_rec) {
struct omap_record *next_rec = NULL;
if (!curr_rec->seen)
report("Omap record", "oid-xid combination is never used.");
if (!curr_rec->seen) {
/*
* I've encountered a single leaked extended snap meta
* block in some ios images. No idea... (TODO)
*/
if (unseen == 0 && curr_rec->xid < sb->s_xid) {
struct apfs_obj_phys *raw = NULL;
struct object obj = {0};
raw = read_object_nocheck(curr_rec->bno, &obj);
if (obj.type != OBJECT_TYPE_SNAP_META_EXT || obj.subtype != APFS_OBJECT_TYPE_INVALID)
report("Leaked omap record", "unexpected object type.");
munmap(raw, sb->s_blocksize);
++unseen;
} else {
report("Omap record", "oid-xid combination is never used.");
}
}
next_rec = curr_rec->next;
free(curr_rec);
@@ -675,6 +692,7 @@ static struct omap_record *get_omap_record(u64 oid, u64 xid, struct htable_entry
if (!new)
system_error();
new->xid = xid;
new->oid = oid;
new->next = omap;
*omap_p = new;
return new;
apfsck/btree.h
+1
View File
@@ -21,6 +21,7 @@ struct omap_record {
struct omap_record *next; /* Next entry in linked list */
u64 xid; /* Transaction id */
u64 oid; /* Virtual object id */
u64 bno; /* Block number */
/* Was this oid-xid pair ever seen in use? */