Switch forkfix to litehook rebinds on iOS 15 arm64e to hopefully brin…

…g back the frequency of spinlock panics to what they were on 2.1.x
opa334 · Dec 13, 2024 · 39069e8 · 39069e8
1 parent bc4e550
commit 39069e8
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 13 deletions.
diff --git a/BaseBin/_external/modules/litehook b/BaseBin/_external/modules/litehook
diff --git a/BaseBin/forkfix/Makefile b/BaseBin/forkfix/Makefile
@@ -1,7 +1,7 @@
 TARGET = forkfix.dylib
 CC = clang
 
-CFLAGS = -I../.include -I./src -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -arch arm64e -miphoneos-version-min=15.0 -O2
+CFLAGS = -I../.include -I./src -I../_external/modules/litehook/src -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -arch arm64e -miphoneos-version-min=15.0 -O2
 LDFLAGS = -dynamiclib
 
 sign: $(TARGET)

diff --git a/BaseBin/forkfix/src/litehook.h b/BaseBin/forkfix/src/litehook.h
diff --git a/BaseBin/forkfix/src/main.c b/BaseBin/forkfix/src/main.c
@@ -5,6 +5,7 @@
 #include <signal.h>
 #include <dlfcn.h>
 #include <os/log.h>
+#include <util.h>
 #include "syscall.h"
 #include "litehook.h"
 #include <libjailbreak/jbclient_xpc.h>
@@ -92,13 +93,63 @@ __attribute__((visibility ("default"))) pid_t forkfix___fork(void)
 	return pid;
 }
 
+void apply_fork_hook(void)
+{
+	static dispatch_once_t onceToken;
+	dispatch_once (&onceToken, ^{
+		void *systemhookHandle = dlopen("systemhook.dylib", RTLD_NOLOAD);
+		if (systemhookHandle) {
+			kern_return_t (*litehook_hook_function)(void *source, void *target) = dlsym(systemhookHandle, "litehook_hook_function");
+			if (litehook_hook_function) {
+				litehook_hook_function((void *)__fork, (void *)forkfix___fork);
+			}
+		}
+	});
+}
+
+// iOS 15 arm64e wrappers
+// Only apply fork hook when something actually calls it
+int fork_hook(void)
+{
+	apply_fork_hook();
+	return fork();
+}
+int vfork_hook(void)
+{
+	apply_fork_hook();
+	return vfork();
+}
+pid_t forkpty_hook(int *amaster, char *name, struct termios *termp, struct winsize *winp)
+{
+	apply_fork_hook();
+	return forkpty(amaster, name, termp, winp);
+}
+int daemon_hook(int __nochdir, int __noclose)
+{
+	apply_fork_hook();
+	return daemon(__nochdir, __noclose);
+}
+
 __attribute__((constructor)) static void initializer(void)
 {
-	void *systemhookHandle = dlopen("systemhook.dylib", RTLD_NOLOAD);
-	if (systemhookHandle) {
-		kern_return_t (*litehook_hook_function)(void *source, void *target) = dlsym(systemhookHandle, "litehook_hook_function");
-		if (litehook_hook_function) {
-			litehook_hook_function((void *)&__fork, (void *)&forkfix___fork);
+#ifdef __arm64e__
+	if (__builtin_available(iOS 16.0, *)) { /* fall through */ }
+	else {
+		void *systemhookHandle = dlopen("systemhook.dylib", RTLD_NOLOAD);
+		if (systemhookHandle) {
+			// On iOS 15 arm64e, instead of using instruction replacements, rebind __fork instead
+			// Less instruction replacements = Less spinlock panics
+			kern_return_t (*litehook_rebind_symbol_globally)(void *source, void *target) = dlsym(systemhookHandle, "litehook_rebind_symbol_globally");
+			if (litehook_rebind_symbol_globally) {
+				litehook_rebind_symbol_globally((void *)fork, (void *)fork_hook);
+				litehook_rebind_symbol_globally((void *)vfork, (void *)vfork_hook);
+				litehook_rebind_symbol_globally((void *)forkpty, (void *)forkpty_hook);
+				litehook_rebind_symbol_globally((void *)daemon, (void *)daemon_hook);
+			}
 		}
+		return;
 	}
+#endif
+
+	apply_fork_hook();
 }