Remove oldABI until further notice, the dsc mlock implementation doesn't seem to be good enough since it only wires in the pmap layer, but not in the vm layer

opa334 · opa334 · commit 5151d408c4f0 · 2025-01-04T00:20:53.000+01:00
diff --git a/Application/Dopamine/Jailbreak/DOJailbreaker.m b/Application/Dopamine/Jailbreak/DOJailbreaker.m
@@ -488,7 +488,6 @@ - (void)runWithError:(NSError **)errOut didRemoveJailbreak:(BOOL*)didRemove show
     BOOL tweaksEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"tweakInjectionEnabled" fallback:YES];
     BOOL idownloadEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"idownloadEnabled" fallback:NO];
     BOOL appJITEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"appJITEnabled" fallback:YES];
-    BOOL oldAbiSupportEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"oldAbiSupportEnabled" fallback:YES];
     NSNumber *jetsamMultiplierOption = [[DOPreferenceManager sharedManager] preferenceValueForKey:@"jetsamMultiplier"];
     
     struct utsname systemInfo;
@@ -503,7 +502,6 @@ - (void)runWithError:(NSError **)errOut didRemoveJailbreak:(BOOL*)didRemove show
     
     gSystemInfo.jailbreakSettings.markAppsAsDebugged = appJITEnabled;
     gSystemInfo.jailbreakSettings.jetsamMultiplier = jetsamMultiplierOption ? (jetsamMultiplierOption.doubleValue / 2) : 0;
-    gSystemInfo.jailbreakSettings.oldAbiSupportEnabled = oldAbiSupportEnabled;
     
     [[DOUIManager sharedInstance] sendLog:DOLocalizedString(@"Building Phys R/W Primitive") debug:NO];
     *errOut = [self buildPhysRWPrimitive];
diff --git a/Application/Dopamine/UI/Settings/DOSettingsController.m b/Application/Dopamine/UI/Settings/DOSettingsController.m
@@ -240,14 +240,6 @@ - (id)specifiers
             [appJitSpecifier setProperty:@YES forKey:@"default"];
             [specifiers addObject:appJitSpecifier];
             
-            if (envManager.isArm64e) {
-                PSSpecifier *oldabiSpecifier = [PSSpecifier preferenceSpecifierNamed:DOLocalizedString(@"Settings_Allow_Old_arm64e_ABI_Libraries") target:self set:@selector(setOldABIEnabled:specifier:) get:@selector(readOldABIEnabled:) detail:nil cell:PSSwitchCell edit:nil];
-                [oldabiSpecifier setProperty:@YES forKey:@"enabled"];
-                [oldabiSpecifier setProperty:@"oldAbiSupportEnabled" forKey:@"key"];
-                [oldabiSpecifier setProperty:@YES forKey:@"default"];
-                [specifiers addObject:oldabiSpecifier];
-            }
-            
             PSSpecifier *jetsamSpecifier = [PSSpecifier preferenceSpecifierNamed:DOLocalizedString(@"Settings_Jetsam_Multiplier") target:self set:@selector(setJetsamMultiplier:specifier:) get:@selector(readJetsamMultiplier:) detail:nil cell:PSLinkListCell edit:nil];
             [jetsamSpecifier setProperty:@YES forKey:@"enabled"];
             [jetsamSpecifier setProperty:@"jetsamMultiplier" forKey:@"key"];
@@ -453,25 +445,6 @@ - (void)setJetsamMultiplier:(id)value specifier:(PSSpecifier *)specifier
     }
 }
 
-- (id)readOldABIEnabled:(PSSpecifier *)specifier
-{
-    DOEnvironmentManager *envManager = [DOEnvironmentManager sharedManager];
-    if (envManager.isJailbroken) {
-        bool v = jbclient_jbsettings_get_bool("oldAbiSupportEnabled");
-        return @(v);
-    }
-    return [self readPreferenceValue:specifier];
-}
-
-- (void)setOldABIEnabled:(id)value specifier:(PSSpecifier *)specifier
-{
-    [self setPreferenceValue:value specifier:specifier];
-    DOEnvironmentManager *envManager = [DOEnvironmentManager sharedManager];
-    if (envManager.isJailbroken) {
-        jbclient_platform_jbsettings_set_bool("oldAbiSupportEnabled", ((NSNumber *)value).boolValue);
-    }
-}
-
 - (void)setRemoveJailbreakEnabled:(id)value specifier:(PSSpecifier *)specifier
 {
     [self setPreferenceValue:value specifier:specifier];
diff --git a/Application/Dopamine/main.m b/Application/Dopamine/main.m
@@ -36,7 +36,7 @@ int main(int argc, char * argv[]) {
     
     // If systemhook isn't loaded and we are already jailbroken, we need to do the checkin ourselves
     // This can happen when the jailbreak is hidden or when tweak injection into the Dopamine app is disabled via Choicy
-    jbclient_process_checkin(NULL, NULL, NULL, NULL, NULL);
+    jbclient_process_checkin(NULL, NULL, NULL, NULL);
     
     if ([DOEnvironmentManager sharedManager].isJailbroken) {
         setenv("PATH", "/sbin:/bin:/usr/sbin:/usr/bin:/var/jb/sbin:/var/jb/bin:/var/jb/usr/sbin:/var/jb/usr/bin", 1);
diff --git a/BaseBin/launchdhook/src/jbserver/jbdomain_systemwide.c b/BaseBin/launchdhook/src/jbserver/jbdomain_systemwide.c
@@ -124,7 +124,7 @@ static int systemwide_trust_library(audit_token_t *processToken, const char *lib
 	return trust_file(libraryPath, callerLibraryPath, callerPath, NULL);
 }
 
-static int systemwide_process_checkin(audit_token_t *processToken, char **rootPathOut, char **bootUUIDOut, char **sandboxExtensionsOut, bool *fullyDebuggedOut, bool *oldABIEnabledOut)
+static int systemwide_process_checkin(audit_token_t *processToken, char **rootPathOut, char **bootUUIDOut, char **sandboxExtensionsOut, bool *fullyDebuggedOut)
 {
 	// Fetch process info
 	pid_t pid = audit_token_to_pid(*processToken);
@@ -172,8 +172,6 @@ static int systemwide_process_checkin(audit_token_t *processToken, char **rootPa
 	// Allow invalid pages
 	cs_allow_invalid(proc, fullyDebugged);
 
-	*oldABIEnabledOut = jb_is_oldabi_fix_enabled();
-
 	// Fix setuid
 	struct stat sb;
 	if (stat(procPath, &sb) == 0) {
@@ -384,7 +382,6 @@ struct jbserver_domain gSystemwideDomain = {
 				{ .name = "boot-uuid", .type = JBS_TYPE_STRING, .out = true },
 				{ .name = "sandbox-extensions", .type = JBS_TYPE_STRING, .out = true },
 				{ .name = "fully-debugged", .type = JBS_TYPE_BOOL, .out = true },
-				{ .name = "oldabi-enabled", .type = JBS_TYPE_BOOL, .out = true },
 				{ 0 },
 			},
 		},
diff --git a/BaseBin/launchdhook/src/jbserver/jbsettings.c b/BaseBin/launchdhook/src/jbserver/jbsettings.c
@@ -12,10 +12,6 @@ int jbsettings_get(const char *key, xpc_object_t *valueOut)
 		*valueOut = xpc_double_create(jbsetting(jetsamMultiplier));
 		return 0;
 	}
-	else if (!strcmp(key, "oldAbiSupportEnabled")) {
-		*valueOut = xpc_bool_create(jbsetting(oldAbiSupportEnabled));
-		return 0;
-	}
 	return -1;
 }
 
@@ -29,10 +25,5 @@ int jbsettings_set(const char *key, xpc_object_t value)
 		gSystemInfo.jailbreakSettings.jetsamMultiplier = xpc_double_get_value(value);
 		return 0;
 	}
-	else if (!strcmp(key, "oldAbiSupportEnabled") && xpc_get_type(value) == XPC_TYPE_BOOL) {
-		gSystemInfo.jailbreakSettings.oldAbiSupportEnabled = xpc_bool_get_value(value);
-		jb_set_oldabi_support_enabled(gSystemInfo.jailbreakSettings.oldAbiSupportEnabled);
-		return 0;
-	}
 	return -1;
 }
diff --git a/BaseBin/launchdhook/src/main.m b/BaseBin/launchdhook/src/main.m
@@ -5,6 +5,7 @@
 #import <libjailbreak/dsc_mlock.h>
 #import <mach-o/dyld.h>
 #import <spawn.h>
+#import <pthread.h>
 #import <substrate.h>
 
 #import "spawn_hook.h"
@@ -22,6 +23,25 @@
 
 void abort_with_reason(uint32_t reason_namespace, uint64_t reason_code, const char *reason_string, uint64_t reason_flags);
 
+void *handle_text_locks(void *a1)
+{
+#ifdef __arm64e__
+	if (__builtin_available(iOS 16.0, *)) { /* fall through */ }
+	else {
+		// Spinlock panics happen when a lot of processes try to fault in the same TEXT page at the same time
+		// For some reason, in all panics I personally looked at, the page is inside one of these 5 libraries
+		// If we mlock all of them (to prevent them from ever being paged out), we can reduce spinlock panics by a significant amount
+		dsc_mlock_library_exec("/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices");
+		dsc_mlock_library_exec("/System/Library/PrivateFrameworks/HMFoundation.framework/HMFoundation");
+		dsc_mlock_library_exec("/System/Library/PrivateFrameworks/GeoServices.framework/GeoServices");
+		dsc_mlock_library_exec("/System/Library/PrivateFrameworks/BluetoothManager.framework/BluetoothManager");
+		dsc_mlock_library_exec("/System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration");
+	}
+#endif
+
+	return NULL;
+}
+
 __attribute__((constructor)) static void initializer(void)
 {
 	crashreporter_start();
@@ -73,32 +93,17 @@
 
 	cs_allow_invalid(proc_self(), false);
 
+	pthread_t tmpThread;
+	pthread_create(&tmpThread, NULL, handle_text_locks, NULL);
+	pthread_join(tmpThread, NULL);
+
 	initXPCHooks();
 	initDaemonHooks();
 	initSpawnHooks();
 	initIPCHooks();
 	initDSCHooks();
 	initJetsamHook();
 
-	if (!firstLoad) {
-		// If enabled, reenable oldabi support
-		jb_set_oldabi_support_enabled(gSystemInfo.jailbreakSettings.oldAbiSupportEnabled);
-
-#ifdef __arm64e__
-		if (__builtin_available(iOS 16.0, *)) { /* fall through */ }
-		else {
-			// Spinlock panics happen when a lot of processes try to fault in the same TEXT page at the same time
-			// For some reason, in all panics I personally looked at, the page is inside one of these 5 libraries
-			// If we mlock all of them (to prevent them from ever being paged out), we can reduce spinlock panics by a significant amount
-			dsc_mlock_library_exec("/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices");
-			dsc_mlock_library_exec("/System/Library/PrivateFrameworks/HMFoundation.framework/HMFoundation");
-			dsc_mlock_library_exec("/System/Library/PrivateFrameworks/GeoServices.framework/GeoServices");
-			dsc_mlock_library_exec("/System/Library/PrivateFrameworks/BluetoothManager.framework/BluetoothManager");
-			dsc_mlock_library_exec("/System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration");
-		}
-#endif
-	}
-
 	// This will ensure launchdhook is always reinjected after userspace reboots
 	// As this launchd will pass environ to the next launchd...
 	setenv("DYLD_INSERT_LIBRARIES", JBROOT_PATH("/basebin/launchdhook.dylib"), 1);
diff --git a/BaseBin/launchdhook/src/spawn_hook.c b/BaseBin/launchdhook/src/spawn_hook.c
@@ -75,9 +75,6 @@ int __posix_spawn_hook(pid_t *restrict pid, const char *restrict path,
 				unsetenv("STAGED_JAILBREAK_UPDATE");
 			}
 
-			// Restore original page contents of oldabi patched pages
-			jb_set_oldabi_support_enabled(false);
-
 			// Always use environ instead of envp, as boomerang_stashPrimitives calls setenv
 			// setenv / unsetenv can sometimes cause environ to get reallocated
 			// In that case envp may point to garbage or be empty
diff --git a/BaseBin/launchdhook/src/update.m b/BaseBin/launchdhook/src/update.m
@@ -199,11 +199,5 @@ void jbupdate_finalize_stage2(const char *prevVersion, const char *newVersion)
 #endif
 	}
 
-	if (strcmp(prevVersion, "2.3") < 0 && strcmp(newVersion, "2.3") >= 0) {
-		// Default value for this pref is true
-		// Set it during jbupdate if prev version is <2.3 and new version is >=2.3
-		gSystemInfo.jailbreakSettings.oldAbiSupportEnabled = true;
-	}
-
 	JBFixMobilePermissions();
 }
diff --git a/BaseBin/libjailbreak/src/info.h b/BaseBin/libjailbreak/src/info.h
@@ -35,7 +35,6 @@ struct system_info {
 	struct {
 		bool markAppsAsDebugged;
 		double jetsamMultiplier;
-		bool oldAbiSupportEnabled;
 	} jailbreakSettings;
 
 	struct {
@@ -251,8 +250,7 @@ extern struct system_info gSystemInfo;
 
 #define JAILBREAK_SETTINGS_ITERATE(ctx, iterator) \
 	iterator(ctx, jailbreakSettings.markAppsAsDebugged); \
-	iterator(ctx, jailbreakSettings.jetsamMultiplier); \
-	iterator(ctx, jailbreakSettings.oldAbiSupportEnabled);
+	iterator(ctx, jailbreakSettings.jetsamMultiplier);
 
 #define KERNEL_SYMBOLS_ITERATE(ctx, iterator) \
 	iterator(ctx, kernelSymbol.perfmon_dev_open); \
diff --git a/BaseBin/libjailbreak/src/jbclient_xpc.c b/BaseBin/libjailbreak/src/jbclient_xpc.c
@@ -234,7 +234,7 @@ int jbclient_trust_library(const char *libraryPath, void *addressInCaller)
 	return -1;
 }
 
-int jbclient_process_checkin(char **rootPathOut, char **bootUUIDOut, char **sandboxExtensionsOut, bool *fullyDebuggedOut, bool *oldABIEnabledOut)
+int jbclient_process_checkin(char **rootPathOut, char **bootUUIDOut, char **sandboxExtensionsOut, bool *fullyDebuggedOut)
 {
 	xpc_object_t xreply = jbserver_xpc_send(JBS_DOMAIN_SYSTEMWIDE, JBS_SYSTEMWIDE_PROCESS_CHECKIN, NULL);
 	if (xreply) {
@@ -246,7 +246,6 @@ int jbclient_process_checkin(char **rootPathOut, char **bootUUIDOut, char **sand
 		if (bootUUIDOut) *bootUUIDOut = bootUUID ? strdup(bootUUID) : NULL;
 		if (sandboxExtensionsOut) *sandboxExtensionsOut = sandboxExtensions ? strdup(sandboxExtensions) : NULL;
 		if (fullyDebuggedOut) *fullyDebuggedOut = xpc_dictionary_get_bool(xreply, "fully-debugged");
-		if (oldABIEnabledOut) *oldABIEnabledOut = xpc_dictionary_get_bool(xreply, "oldabi-enabled");
 		xpc_release(xreply);
 		return result;
 	}
diff --git a/BaseBin/libjailbreak/src/jbclient_xpc.h b/BaseBin/libjailbreak/src/jbclient_xpc.h
@@ -14,7 +14,7 @@ char *jbclient_get_jbroot(void);
 char *jbclient_get_boot_uuid(void);
 int jbclient_trust_binary(const char *binaryPath, xpc_object_t preferredArchsArray);
 int jbclient_trust_library(const char *libraryPath, void *addressInCaller);
-int jbclient_process_checkin(char **rootPathOut, char **bootUUIDOut, char **sandboxExtensionsOut, bool *fullyDebuggedOut, bool *oldABIEnabledOut);
+int jbclient_process_checkin(char **rootPathOut, char **bootUUIDOut, char **sandboxExtensionsOut, bool *fullyDebuggedOut);
 int jbclient_fork_fix(uint64_t childPid);
 int jbclient_cs_revalidate(void);
 int jbclient_jbsettings_get(const char *key, xpc_object_t *valueOut);
diff --git a/BaseBin/systemhook/src/main.c b/BaseBin/systemhook/src/main.c
@@ -14,7 +14,6 @@
 #include "private.h"
 
 bool gFullyDebugged = false;
-bool gOldAbiSupportEnabled = false;
 static void *gLibSandboxHandle;
 char *JB_BootUUID = NULL;
 char *JB_RootPath = NULL;
@@ -86,14 +85,6 @@ void* dyld_dlopen_hook(void *dyld, const char* path, int mode)
 		jbclient_trust_library(path, __builtin_return_address(0));
 	}
 
-	if (gOldAbiSupportEnabled && path) {
-		// If Dopamine's oldABI support is enabled, prevent ellekit oldabi from injecting
-		// It's redundant in this case, it also hooks dlopen which is not good for spinlocks
-		if (!strcmp(path, "/var/jb/usr/lib/ellekit/OldABI.dylib")) {
-			return NULL;
-		}
-	}
-
     __attribute__((musttail)) return dyld_dlopen_orig(dyld, path, mode);
 }
 
@@ -288,7 +279,7 @@ __attribute__((constructor)) static void initializer(void)
 {
 	// Tell jbserver (in launchd) that this process exists
 	// This will disable page validation, which allows the rest of this constructor to apply hooks
-	if (jbclient_process_checkin(&JB_RootPath, &JB_BootUUID, &JB_SandboxExtensions, &gFullyDebugged, &gOldAbiSupportEnabled) != 0) return;
+	if (jbclient_process_checkin(&JB_RootPath, &JB_BootUUID, &JB_SandboxExtensions, &gFullyDebugged) != 0) return;
 
 	// Apply sandbox extensions
 	apply_sandbox_extensions();

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,6 @@ int jbsettings_get(const char key, xpc_object_t valueOut)`
`12`	`12`	`*valueOut = xpc_double_create(jbsetting(jetsamMultiplier));`
`13`	`13`	`return 0;`
`14`	`14`	`}`
`15`		`- else if (!strcmp(key, "oldAbiSupportEnabled")) {`
`16`		`- *valueOut = xpc_bool_create(jbsetting(oldAbiSupportEnabled));`
`17`		`- return 0;`
`18`		`- }`
`19`	`15`	`return -1;`
`20`	`16`	`}`
`21`	`17`
`@@ -29,10 +25,5 @@ int jbsettings_set(const char *key, xpc_object_t value)`
`29`	`25`	`gSystemInfo.jailbreakSettings.jetsamMultiplier = xpc_double_get_value(value);`
`30`	`26`	`return 0;`
`31`	`27`	`}`
`32`		`- else if (!strcmp(key, "oldAbiSupportEnabled") && xpc_get_type(value) == XPC_TYPE_BOOL) {`
`33`		`- gSystemInfo.jailbreakSettings.oldAbiSupportEnabled = xpc_bool_get_value(value);`
`34`		`- jb_set_oldabi_support_enabled(gSystemInfo.jailbreakSettings.oldAbiSupportEnabled);`
`35`		`- return 0;`
`36`		`- }`
`37`	`28`	`return -1;`
`38`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,6 @@ int __posix_spawn_hook(pid_t restrict pid, const char restrict path,`
`75`	`75`	`unsetenv("STAGED_JAILBREAK_UPDATE");`
`76`	`76`	`}`
`77`	`77`
`78`		`- // Restore original page contents of oldabi patched pages`
`79`		`- jb_set_oldabi_support_enabled(false);`
`80`		`-`
`81`	`78`	`// Always use environ instead of envp, as boomerang_stashPrimitives calls setenv`
`82`	`79`	`// setenv / unsetenv can sometimes cause environ to get reallocated`
`83`	`80`	`// In that case envp may point to garbage or be empty`
Original file line number	Diff line number	Diff line change
`@@ -199,11 +199,5 @@ void jbupdate_finalize_stage2(const char prevVersion, const char newVersion)`
`199`	`199`	`#endif`
`200`	`200`	`}`
`201`	`201`
`202`		`- if (strcmp(prevVersion, "2.3") < 0 && strcmp(newVersion, "2.3") >= 0) {`
`203`		`- // Default value for this pref is true`
`204`		`- // Set it during jbupdate if prev version is <2.3 and new version is >=2.3`
`205`		`- gSystemInfo.jailbreakSettings.oldAbiSupportEnabled = true;`
`206`		`- }`
`207`		`-`
`208`	`202`	`JBFixMobilePermissions();`
`209`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ int jbclient_trust_library(const char libraryPath, void addressInCaller)`
`234`	`234`	`return -1;`
`235`	`235`	`}`
`236`	`236`
`237`		`-int jbclient_process_checkin(char rootPathOut, char bootUUIDOut, char *sandboxExtensionsOut, bool fullyDebuggedOut, bool *oldABIEnabledOut)`
	`237`	`+int jbclient_process_checkin(char rootPathOut, char bootUUIDOut, char *sandboxExtensionsOut, bool fullyDebuggedOut)`
`238`	`238`	`{`
`239`	`239`	`xpc_object_t xreply = jbserver_xpc_send(JBS_DOMAIN_SYSTEMWIDE, JBS_SYSTEMWIDE_PROCESS_CHECKIN, NULL);`
`240`	`240`	`if (xreply) {`
`@@ -246,7 +246,6 @@ int jbclient_process_checkin(char rootPathOut, char bootUUIDOut, char **sand`
`246`	`246`	`if (bootUUIDOut) *bootUUIDOut = bootUUID ? strdup(bootUUID) : NULL;`
`247`	`247`	`if (sandboxExtensionsOut) *sandboxExtensionsOut = sandboxExtensions ? strdup(sandboxExtensions) : NULL;`
`248`	`248`	`if (fullyDebuggedOut) *fullyDebuggedOut = xpc_dictionary_get_bool(xreply, "fully-debugged");`
`249`		`- if (oldABIEnabledOut) *oldABIEnabledOut = xpc_dictionary_get_bool(xreply, "oldabi-enabled");`
`250`	`249`	`xpc_release(xreply);`
`251`	`250`	`return result;`
`252`	`251`	`}`