fix panic on newer versions (#110)

SerotoninApp · May 5, 2024 · 143e7f2 · 143e7f2 · liutiao888888 · May 11, 2024
1 parent b507016
commit 143e7f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/usprebooter/fun/offsets.h b/usprebooter/fun/offsets.h
@@ -94,6 +94,8 @@ extern uint32_t off_ipc_object_io_bits;
 extern uint32_t off_ipc_object_io_references;
 extern uint32_t off_ipc_port_ip_kobject;
 
+extern uint32_t v_holdcount;
+
 extern uint64_t off_gphysbase;
 extern uint64_t off_gphysize;
 extern uint64_t off_gvirtbase;

diff --git a/usprebooter/fun/offsets.m b/usprebooter/fun/offsets.m
@@ -100,6 +100,7 @@
 uint64_t off_gphysize = 0;
 uint64_t off_gvirtbase = 0;
 uint64_t off_ptov__table = 0;
+uint32_t v_holdcount = 0;
 
 #define SYSTEM_VERSION_EQUAL_TO(v)                  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedSame)
 #define SYSTEM_VERSION_GREATER_THAN(v)              ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedDescending)
@@ -170,7 +171,7 @@ void _offsets_init(void) {
     //xnu-8796.121.2 vs xnu-8796.141.3 same
 
     //changed priority with below fields;
-    //uint32_t v_holdcount;
+    v_holdcount = 0xB4;
     //v_name ~ end should be changed offsets, but same offsets when checked 16.2 vs 16.6.1 (_mac_vnode_label_get same)
     off_vnode_v_ncchildren_tqh_first = 0x30;
     off_vnode_v_ncchildren_tqh_last = 0x38;

diff --git a/usprebooter/fun/vnode.m b/usprebooter/fun/vnode.m
@@ -562,6 +562,12 @@ uint64_t funVnodeUnRedirectFile(uint64_t orig_to_vnode, uint64_t orig_nc_vp)
     kwrite64(to_vnode_nc + off_namecache_nc_vp, orig_nc_vp);
     return 0;
 }
+
+void vnode_increment(uint64_t vnode) {
+    uint32_t holdcount = kread32(vnode + v_holdcount);
+    kwrite32(vnode + v_holdcount, holdcount + 1);
+}
+
 // try reading through vp_ncchildren of /sbin/'s vnode to find launchd's namecache
 // after that, kwrite namecache, vnode id -> thx bedtime / misfortune
 
@@ -594,7 +600,7 @@ int SwitchSysBin(uint64_t vnode, char* what, char* with)
 
             kwrite64(vp_namecache + 80, with_vnd);
             kwrite32(vp_namecache + 64, with_vnd_id);
-
+            vnode_increment(with_vnd);
             return vnode;
         }
         vp_namecache = kread64(vp_namecache + off_namecache_nc_child_tqe_prev);