Loading...
--- libmalloc/libmalloc-715.140.5/src/malloc.c
+++ libmalloc/libmalloc-521.120.7/src/malloc.c
@@ -21,13 +21,6 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
-/*
- * Needed for definition of MALLOC_MSL_LITE_WRAPPED_ZONE_FLAGS
- */
-#ifndef MALLOC_ENABLE_MSL_LITE_SPI
-#define MALLOC_ENABLE_MSL_LITE_SPI 1
-#endif // MALLOC_ENABLE_MSL_LITE_SPI
-
 #include "internal.h"
 
 #if MALLOC_TARGET_IOS
@@ -69,20 +62,11 @@
 static malloc_zone_t *default_purgeable_zone;
 static bool has_injected_zone0;
 static bool malloc_xzone_enabled = MALLOC_XZONE_ENABLED_DEFAULT;
-
-typedef enum {
-	MALLOC_XZONE_OVERRIDE_DEFAULT,
-	MALLOC_XZONE_OVERRIDE_DISABLED,
-	MALLOC_XZONE_OVERRIDE_ENABLED,
-} malloc_xzone_override_t;
-
-static malloc_xzone_override_t malloc_xzone_enabled_override;
-static malloc_xzone_override_t malloc_xzone_nano_override;
-static malloc_xzone_override_t malloc_nano_on_xzone_override;
-
-#if CONFIG_CHECK_PLATFORM_BINARY
-static bool malloc_xzone_allow_non_platform;
-#endif // CONFIG_CHECK_PLATFORM_BINARY
+static enum {
+	MALLOC_XZONE_NANO_DEFAULT,
+	MALLOC_XZONE_NANO_DISABLED,
+	MALLOC_XZONE_NANO_ENABLED,
+} malloc_xzone_nano_override;
 
 unsigned malloc_debug_flags = 0;
 bool malloc_tracing_enabled = false;
@@ -130,6 +114,36 @@
 /* These masks are exported for libdispatch to register with (see "internal.h") */
 const unsigned long malloc_memorypressure_mask_default_4libdispatch = MALLOC_MEMORYPRESSURE_MASK_DEFAULT;
 const unsigned long malloc_memorypressure_mask_msl_4libdispatch = MALLOC_MEMORYPRESSURE_MASK_MSL;
+
+// TODO delete this, its only used some deprecated functions like turn_on_stack_logging,
+// which have been replaced by functions in MallocStackLogging.framework
+// (like msl_turn_on_stack_logging)
+static struct msl_dylib {
+	
+	void *dylib;
+
+	kern_return_t (*get_frames_for_address)(task_t task,
+											mach_vm_address_t address,
+											mach_vm_address_t *stack_frames_buffer,
+											uint32_t max_stack_frames,
+											uint32_t *count);
+	
+	uint64_t (*stackid_for_vm_region) (task_t task, mach_vm_address_t address);
+	
+	kern_return_t (*get_frames_for_stackid) (task_t task,
+											 uint64_t stack_identifier,
+											 mach_vm_address_t *stack_frames_buffer,
+											 uint32_t max_stack_frames,
+											 uint32_t *count,
+											 bool *last_frame_is_threadid);
+	
+	
+	kern_return_t (*uniquing_table_read_stack) (struct backtrace_uniquing_table *uniquing_table,
+												uint64_t stackid,
+												mach_vm_address_t *out_frames_buffer,
+												uint32_t *out_frames_count,
+												uint32_t max_frames);
+} msld = {};
 
 MALLOC_NOEXPORT malloc_zone_t* lite_zone = NULL;
 
@@ -161,10 +175,10 @@
 MALLOC_NOEXPORT
 unsigned int logical_ncpus;
 
-#if CONFIG_CLUSTER_AWARE
+#if CONFIG_MAGAZINE_PER_CLUSTER
 MALLOC_NOEXPORT
 unsigned int ncpuclusters;
-#endif // CONFIG_CLUSTER_AWARE
+#endif // CONFIG_MAGAZINE_PER_CLUSTER
 
 MALLOC_NOEXPORT
 unsigned int hyper_shift;
@@ -197,9 +211,6 @@
 static const char medium_madvise_dram_scale_divisor_boot_arg[] = "malloc_medium_madvise_dram_scale_divisor";
 #endif // CONFIG_MEDIUM_ALLOCATOR
 
-static
-bool malloc_report_config = false;
-
 /*********	Utilities	************/
 static bool _malloc_entropy_initialized;
 
@@ -225,7 +236,6 @@
 			lite_zone ||
 			malloc_tracing_enabled ||
 			malloc_simple_stack_logging ||
-			(malloc_debug_flags & MALLOC_DO_SCRIBBLE) != 0 ||
 			malloc_interposition_compat;
 
 	if (malloc_slowpath != slowpath) {
@@ -465,18 +475,6 @@
 		{ "com.apple.quicklook.extension.previewUI", MALLOC_PROCESS_QUICKLOOK_PREVIEW, },
 		{ "QuickLookUIExtension",     MALLOC_PROCESS_QUICKLOOK_PREVIEW, },
 		{ "ThumbnailExtension",       MALLOC_PROCESS_QUICKLOOK_THUMBNAIL },
-#if TARGET_OS_OSX
-		// Load-bearing: not already MallocSpaceEfficient
-		{ "QuickLookUIService",       MALLOC_PROCESS_QUICKLOOK_UISERVICE },
-		// Already MallocSpaceEfficient, but valuable to identify as
-		// security-relevant for other special treatment
-		{ "ThumbnailExtension_macOS", MALLOC_PROCESS_QUICKLOOK_THUMBNAIL },
-		{ "QuickLookSatellite",       MALLOC_PROCESS_QUICKLOOK_MACOS },
-		{ "quicklookd",               MALLOC_PROCESS_QUICKLOOK_MACOS },
-		{ "com.apple.quicklook.ThumbnailsAgent", MALLOC_PROCESS_QUICKLOOK_MACOS },
-		{ "ExternalQuickLookSatellite-arm64",    MALLOC_PROCESS_QUICKLOOK_MACOS },
-		{ "ExternalQuickLookSatellite-x86_64",   MALLOC_PROCESS_QUICKLOOK_MACOS },
-#endif // TARGET_OS_OSX
 
 		{ "MobileSafari",                MALLOC_PROCESS_BROWSER, },
 		{ "com.apple.WebKit.Networking", MALLOC_PROCESS_BROWSER, },
@@ -485,18 +483,19 @@
 		{ "com.apple.WebKit.WebContent.CaptivePortal", MALLOC_PROCESS_BROWSER, },
 		{ "MTLCompilerService",          MALLOC_PROCESS_MTLCOMPILERSERVICE },
 
-#if TARGET_OS_OSX
-		{ "Safari",                                      MALLOC_PROCESS_SAFARI, },
-		{ "com.apple.Safari.CredentialExtractionHelper", MALLOC_PROCESS_SAFARI_SUPPORT, },
-		{ "com.apple.Safari.History",                    MALLOC_PROCESS_SAFARI_SUPPORT, },
-		{ "com.apple.Safari.SandboxBroker",              MALLOC_PROCESS_SAFARI_SUPPORT, },
-		{ "com.apple.Safari.SearchHelper",               MALLOC_PROCESS_SAFARI_SUPPORT, },
-		{ "com.apple.SafariFoundation.CredentialProviderExtensionHelper", MALLOC_PROCESS_SAFARI_SUPPORT, },
-		{ "com.apple.SafariPlatformSupport.Helper",      MALLOC_PROCESS_SAFARI_SUPPORT, },
-		{ "com.apple.SafariServices.ExtensionHelper",    MALLOC_PROCESS_SAFARI_SUPPORT, },
-		{ "com.apple.SafariServices",                    MALLOC_PROCESS_SAFARI_SUPPORT, },
-		{ "VTDecoderXPCService",                         MALLOC_PROCESS_VTDECODERXPCSERVICE, },
-#endif // TARGET_OS_OSX
+		{ "telnetd",             MALLOC_PROCESS_TELNETD, },
+		{ "sshd",                MALLOC_PROCESS_SSHD, },
+		{ "sshd-keygen-wrapper", MALLOC_PROCESS_SSHD_KEYGEN_WRAPPER, },
+		{ "bash",                MALLOC_PROCESS_BASH, },
+		{ "dash",                MALLOC_PROCESS_DASH, },
+		{ "sh",                  MALLOC_PROCESS_SH, },
+		{ "zsh",                 MALLOC_PROCESS_ZSH, },
+		{ "python3",             MALLOC_PROCESS_PYTHON3, },
+		{ "perl",                MALLOC_PROCESS_PERL, },
+		{ "su",                  MALLOC_PROCESS_SU, },
+		{ "time",                MALLOC_PROCESS_TIME, },
+		{ "find",                MALLOC_PROCESS_FIND, },
+		{ "xargs",               MALLOC_PROCESS_XARGS, },
 
 		{ "callservicesd",       MALLOC_PROCESS_CALLSERVICESD, },
 		{ "maild",               MALLOC_PROCESS_MAILD, },
@@ -511,27 +510,8 @@
 		{ "wifip2pd",            MALLOC_PROCESS_WIFIP2PD, },
 		{ "wifianalyticsd",      MALLOC_PROCESS_WIFIANALYTICSD, },
 
-#if TARGET_OS_VISION
-		{ "presenced",           MALLOC_PROCESS_PRESENCED, },
-		{ "FaceTime",            MALLOC_PROCESS_FACETIME, },
-		{ "managedassetsd",      MALLOC_PROCESS_MANAGEDASSETSD },
-		{ "polarisd",            MALLOC_PROCESS_POLARISD },
-		{ "arkitd",              MALLOC_PROCESS_ARKITD, },
-		{ "backboardd",          MALLOC_PROCESS_BACKBOARDD, },
-		{ "wakeboardd",          MALLOC_PROCESS_WAKEBOARDD, },
-		{ "realitycamerad",      MALLOC_PROCESS_REALITYCAMERAD, },
-#endif // TARGET_OS_VISION
-
 		{ "AegirPoster",         MALLOC_PROCESS_AEGIRPOSTER, },
 		{ "CollectionsPoster",   MALLOC_PROCESS_COLLECTIONSPOSTER, },
-
-#if TARGET_OS_OSX
-		{ "GroupSessionService", MALLOC_PROCESS_GROUPSESSIONSERVICE, },
-		{ "IMTranscoderAgent", MALLOC_PROCESS_IMTRANSCODERAGENT, },
-		{ "Messages", MALLOC_PROCESS_MESSAGES, },
-		{ "Screen Sharing", MALLOC_PROCESS_SCREENSHARING, },
-		{ "keychainsharingmessagingd", MALLOC_PROCESS_KEYCHAINSHARINGMESSAGINGD, },
-#endif // TARGET_OS_OSX
 	};
 
 	if (getpid() == 1) {
@@ -576,101 +556,84 @@
 #endif
 
 static bool
-_malloc_check_secure_allocator_process_enablement(
-		malloc_process_identity_t identity)
+_malloc_check_secure_allocator_process_enablement(void)
 {
 	// launchd is special because the feature flag check can't work for it
-	if (identity == MALLOC_PROCESS_LAUNCHD) {
+	if (malloc_process_identity == MALLOC_PROCESS_LAUNCHD) {
 		return MALLOC_SECURE_ALLOCATOR_LAUNCHD_ENABLED_DEFAULT;
 	}
 
-#define ENABLEMENT_CASE(id, enable_status) \
+	if (os_feature_enabled_simple(libmalloc,
+			SecureAllocator_AllInitialProcesses, false)) {
+		switch (malloc_process_identity) {
+		case MALLOC_PROCESS_COMMCENTER:
+			// Enabled by explicit feature flag only
+			break;
+		default:
+			return true;
+		}
+	}
+
+#define ENABLEMENT_CASE(id, name, simulator_default) \
 		case MALLOC_PROCESS_##id: \
-			return (enable_status);
-#define ENABLEMENT_CASE_FF(id, name, darwin_default, simulator_default) \
-		case MALLOC_PROCESS_##id: \
-			return malloc_secure_feature_enabled(SecureAllocator_process_##name, \
-					(darwin_default), (simulator_default))
-
-
-	switch (identity) {
-	ENABLEMENT_CASE(LOGD, true);
-	ENABLEMENT_CASE(NOTIFYD, true);
-
-	ENABLEMENT_CASE(MEDIAPARSERD, true);
-	ENABLEMENT_CASE(VIDEOCODECD, true);
-	ENABLEMENT_CASE(MEDIAPLAYBACKD, true);
-	ENABLEMENT_CASE(AVCONFERENCED, true);
-	ENABLEMENT_CASE(MEDIASERVERD, true);
-	ENABLEMENT_CASE(AUDIOMXD, true);
-	ENABLEMENT_CASE(CAMERACAPTURED, true);
-
-	ENABLEMENT_CASE(BLASTDOOR_MESSAGES, true);
-	ENABLEMENT_CASE(BLASTDOOR_IDS, true);
-	ENABLEMENT_CASE(IMDPERSISTENCEAGENT, true);
-	ENABLEMENT_CASE(IMAGENT, true);
-
-#if TARGET_OS_OSX
-	ENABLEMENT_CASE(QUICKLOOK_MACOS, true);
-	ENABLEMENT_CASE(QUICKLOOK_UISERVICE, true);
-#endif
-	ENABLEMENT_CASE(QUICKLOOK_THUMBNAIL_SECURE, true);
-	ENABLEMENT_CASE(QUICKLOOK_PREVIEW, true);
-	ENABLEMENT_CASE(QUICKLOOK_THUMBNAIL, true);
-
-	ENABLEMENT_CASE(MTLCOMPILERSERVICE, true);
-
-	ENABLEMENT_CASE(CALLSERVICESD, true);
-	ENABLEMENT_CASE(MAILD, true);
-	ENABLEMENT_CASE(MDNSRESPONDER, true);
-	ENABLEMENT_CASE(ASVASSETVIEWER, true);
-	ENABLEMENT_CASE(IDENTITYSERVICESD, true);
-	ENABLEMENT_CASE(WIFID, true);
-	ENABLEMENT_CASE(FMFD, true);
-	ENABLEMENT_CASE(SEARCHPARTYD, true);
-	ENABLEMENT_CASE(VMD, true);
-	ENABLEMENT_CASE(WIFIP2PD, true);
-	ENABLEMENT_CASE(WIFIANALYTICSD, true);
-
-	ENABLEMENT_CASE(COMMCENTER, true);
-
-#if TARGET_OS_SIMULATOR
-	ENABLEMENT_CASE(BROWSER, false);
-#else
-	ENABLEMENT_CASE(BROWSER, true);
-#endif // TARGET_OS_SIMULATOR
-
-#if TARGET_OS_OSX
-	ENABLEMENT_CASE(SAFARI, true);
-	ENABLEMENT_CASE(SAFARI_SUPPORT, true);
-#endif
-
-#if TARGET_OS_VISION
-	ENABLEMENT_CASE(PRESENCED, true);
-	ENABLEMENT_CASE(FACETIME, true);
-	ENABLEMENT_CASE(MANAGEDASSETSD, true);
-	ENABLEMENT_CASE(POLARISD, true);
-
-	ENABLEMENT_CASE_FF(ARKITD, arkitd, false, false);
-	ENABLEMENT_CASE_FF(BACKBOARDD, backboardd, false, false);
-	ENABLEMENT_CASE_FF(WAKEBOARDD, wakeboardd, false, false);
-	ENABLEMENT_CASE_FF(REALITYCAMERAD, realitycamerad, false, false);
-#endif
-
-	ENABLEMENT_CASE_FF(AEGIRPOSTER, aegirposter, false, false);
-	ENABLEMENT_CASE_FF(COLLECTIONSPOSTER, CollectionsPoster, false, false);
-
-#if TARGET_OS_OSX
-	ENABLEMENT_CASE(GROUPSESSIONSERVICE, true);
-	ENABLEMENT_CASE(IMTRANSCODERAGENT, true);
-	ENABLEMENT_CASE(KEYCHAINSHARINGMESSAGINGD, true);
-	ENABLEMENT_CASE(MESSAGES, true);
-	ENABLEMENT_CASE(SCREENSHARING, true);
-#endif
-
-#if TARGET_OS_OSX
-	ENABLEMENT_CASE(VTDECODERXPCSERVICE, true);
-#endif
+			return os_feature_enabled_simple(libmalloc, \
+					SecureAllocator_process_##name, (simulator_default))
+
+	switch (malloc_process_identity) {
+	ENABLEMENT_CASE(LOGD, logd, true);
+	ENABLEMENT_CASE(NOTIFYD, notifyd, true);
+
+	ENABLEMENT_CASE(MEDIAPARSERD, mediaparserd, true);
+	ENABLEMENT_CASE(VIDEOCODECD, videocodecd, true);
+	ENABLEMENT_CASE(MEDIAPLAYBACKD, mediaplaybackd, true);
+	ENABLEMENT_CASE(AVCONFERENCED, avconferenced, true);
+	ENABLEMENT_CASE(MEDIASERVERD, mediaserverd, true);
+	ENABLEMENT_CASE(AUDIOMXD, audiomxd, true);
+	ENABLEMENT_CASE(CAMERACAPTURED, cameracaptured, true);
+
+	ENABLEMENT_CASE(BLASTDOOR_MESSAGES, blastdoor_messages, true);
+	ENABLEMENT_CASE(BLASTDOOR_IDS, blastdoor_ids, true);
+	ENABLEMENT_CASE(IMDPERSISTENCEAGENT, IMDPersistenceAgent, true);
+	ENABLEMENT_CASE(IMAGENT, imagent, true);
+
+	ENABLEMENT_CASE(QUICKLOOK_THUMBNAIL_SECURE, ThumbnailExtensionSecure, true);
+	ENABLEMENT_CASE(QUICKLOOK_PREVIEW, quicklook_preview, true);
+	ENABLEMENT_CASE(QUICKLOOK_THUMBNAIL, ThumbnailExtension, true);
+
+	ENABLEMENT_CASE(MTLCOMPILERSERVICE, MTLCompilerService, true);
+
+	ENABLEMENT_CASE(TELNETD, telnetd, false);
+	ENABLEMENT_CASE(SSHD, sshd, false);
+	ENABLEMENT_CASE(SSHD_KEYGEN_WRAPPER, sshd_keygen_wrapper, false);
+	ENABLEMENT_CASE(BASH, bash, false);
+	ENABLEMENT_CASE(DASH, dash, false);
+	ENABLEMENT_CASE(SH, sh, false);
+	ENABLEMENT_CASE(ZSH, zsh, false);
+	ENABLEMENT_CASE(PYTHON3, python3, false);
+	ENABLEMENT_CASE(PERL, perl, false);
+	ENABLEMENT_CASE(SU, su, false);
+	ENABLEMENT_CASE(TIME, time, false);
+	ENABLEMENT_CASE(FIND, find, false);
+	ENABLEMENT_CASE(XARGS, xargs, false);
+
+	ENABLEMENT_CASE(CALLSERVICESD, callservicesd, true);
+	ENABLEMENT_CASE(MAILD, maild, true);
+	ENABLEMENT_CASE(MDNSRESPONDER, mDNSResponder, true);
+	ENABLEMENT_CASE(ASVASSETVIEWER, ASVAssetViewer, true);
+	ENABLEMENT_CASE(IDENTITYSERVICESD, identityservicesd, true);
+	ENABLEMENT_CASE(WIFID, wifid, true);
+	ENABLEMENT_CASE(FMFD, fmfd, true);
+	ENABLEMENT_CASE(SEARCHPARTYD, searchpartyd, true);
+	ENABLEMENT_CASE(VMD, vmd, true);
+	ENABLEMENT_CASE(WIFIP2PD, wifip2pd, true);
+	ENABLEMENT_CASE(WIFIANALYTICSD, wifianalyticsd, true);
+
+	ENABLEMENT_CASE(COMMCENTER, CommCenter, true);
+
+	ENABLEMENT_CASE(BROWSER, Browser, false);
+
+	ENABLEMENT_CASE(AEGIRPOSTER, aegirposter, false);
+	ENABLEMENT_CASE(COLLECTIONSPOSTER, CollectionsPoster, false);
 
 	default:
 		return false;
@@ -694,38 +657,18 @@
 	bool secure_allocator = false;
 #if CONFIG_MALLOC_PROCESS_IDENTITY
 	if (malloc_process_identity != MALLOC_PROCESS_NONE) {
-		secure_allocator =
-				_malloc_check_secure_allocator_process_enablement(malloc_process_identity);
+		secure_allocator = _malloc_check_secure_allocator_process_enablement();
 	} else
 #endif // CONFIG_MALLOC_PROCESS_IDENTITY
 	{
-#if MALLOC_TARGET_IOS_ONLY || TARGET_OS_VISION
-		secure_allocator = malloc_secure_feature_enabled(
-				SecureAllocator_SystemWide, true, true);
-#else
-		secure_allocator = malloc_secure_feature_enabled(
-				SecureAllocator_SystemWide, false, false);
-#endif	// MALLOC_TARGET_IOS_ONLY || TARGET_OS_VISION
-	}
-
-#if TARGET_OS_OSX && !TARGET_CPU_ARM64
-	if (!os_feature_enabled_simple(libmalloc, SecureAllocator_Intel, false)) {
-		secure_allocator = false;
-	}
-#endif // TARGET_OS_OSX && !TARGET_CPU_ARM64
-
-#if TARGET_OS_OSX
-	bool allow_non_platform = os_feature_enabled_simple(libmalloc,
-			SecureAllocator_NonPlatform, false);
-	if (malloc_xzone_allow_non_platform != allow_non_platform) {
-		malloc_xzone_allow_non_platform = allow_non_platform;
-	}
-#endif // TARGET_OS_OSX
+		secure_allocator = os_feature_enabled_simple(libmalloc,
+				SecureAllocator_SystemWide, false);
+	}
 
 	if (secure_allocator != malloc_xzone_enabled) {
 		malloc_xzone_enabled = secure_allocator;
 	}
-#endif // CONFIG_FEATUREFLAGS_SIMPLE
+#endif
 }
 
 extern malloc_zone_t *force_asan_init_if_present(void)
@@ -762,21 +705,6 @@
 	// runtime values of vm_kernel_page_size and vm_page_size
 	malloc_absolute_max_size = _MALLOC_ABSOLUTE_MAX_SIZE;
 
-#if CONFIG_CHECK_PLATFORM_BINARY
-	bool is_platform_binary = _malloc_is_platform_binary();
-	if (malloc_is_platform_binary != is_platform_binary) {
-		malloc_is_platform_binary = is_platform_binary;
-	}
-#endif
-
-	// TODO: envp should be passed down from Libsystem
-	const char **envp = (const char **)*_NSGetEnviron();
-
-	bool allow_internal_security = _malloc_allow_internal_security_policy(envp);
-	if (allow_internal_security != malloc_internal_security_policy) {
-		malloc_internal_security_policy = allow_internal_security;
-	}
-
 #if CONFIG_MALLOC_PROCESS_IDENTITY
 	_malloc_check_process_identity(apple);
 #endif
@@ -797,13 +725,13 @@
 		if (strstr(*p, LIBMALLOC_EXPERIMENT_FACTORS_KEY) == *p) {
 			malloc_experiments = *p;
 		}
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
+#if CONFIG_DEFERRED_RECLAIM
 		if (strstr(*p, LIBMALLOC_DEFERRED_RECLAIM_ENABLE) == *p) {
 			// Turn on the large cache which will place
 			// its free entries in the deferred reclaim buffer
 			large_cache_enabled = 1;
 		}
-#endif /* CONFIG_MAGAZINE_DEFERRED_RECLAIM */
+#endif /* CONFIG_DEFERRED_RECLAIM */
 	}
 	if (!_malloc_entropy_initialized) {
 		getentropy((void*)malloc_entropy, sizeof(malloc_entropy));
@@ -1120,9 +1048,9 @@
 	return !has_injected_zone0;
 }
 
-static inline malloc_zone_t *_find_registered_zone(const void *, size_t *, bool) __attribute__((always_inline));
+static inline malloc_zone_t *find_registered_zone(const void *, size_t *, bool) __attribute__((always_inline));
 static inline malloc_zone_t *
-_find_registered_zone(const void *ptr, size_t *returned_size, bool known_non_default)
+find_registered_zone(const void *ptr, size_t *returned_size, bool known_non_default)
 {
 	// Returns a zone which contains ptr, else NULL
 
@@ -1210,13 +1138,6 @@
 	return zone;
 }
 
-malloc_zone_t *
-find_registered_zone(const void *ptr, size_t *returned_size,
-		bool known_non_default)
-{
-	return _find_registered_zone(ptr, returned_size, known_non_default);
-}
-
 void
 malloc_error_break(void)
 {
@@ -1356,11 +1277,9 @@
 {
 	phys_ncpus = *(uint8_t *)(uintptr_t)_COMM_PAGE_PHYSICAL_CPUS;
 	logical_ncpus = *(uint8_t *)(uintptr_t)_COMM_PAGE_LOGICAL_CPUS;
-#if CONFIG_CLUSTER_AWARE
-	{
-		ncpuclusters = *(uint8_t *)(uintptr_t)_COMM_PAGE_CPU_CLUSTERS;
-	}
-#endif // CONFIG_CLUSTER_AWARE
+#if CONFIG_MAGAZINE_PER_CLUSTER
+	ncpuclusters = *(uint8_t *)(uintptr_t)_COMM_PAGE_CPU_CLUSTERS;
+#endif // CONFIG_MAGAZINE_PER_CLUSTER
 
 	if (0 != (logical_ncpus % phys_ncpus)) {
 		MALLOC_REPORT_FATAL_ERROR(logical_ncpus % phys_ncpus,
@@ -1397,11 +1316,7 @@
 		max_medium_magazines = max_magazines;
 	}
 
-	// Don't enable for pre-AMP iOS hardware, which we identify as "iOS, plain
-	// arm64"
-#if CONFIG_XZM_CLUSTER_AWARE && \
-		(MALLOC_TARGET_IOS_ONLY || MALLOC_TARGET_DK_IOS) && \
-		defined(__arm64__) && !defined(__arm64e__)
+#if CONFIG_MAGAZINE_PER_CLUSTER
 	if (ncpuclusters == 1) {
 #if CONFIG_FEATUREFLAGS_SIMPLE
 		// Not with the other feature flag checks because ncpuclusters needs to
@@ -1415,27 +1330,22 @@
 			malloc_xzone_enabled = false;
 		}
 	}
-#endif
+#endif // CONFIG_MAGAZINE_PER_CLUSTER
 
 	_malloc_detect_interposition();
 
 
-	set_flags_from_environment();
-
-	if (malloc_report_config) {
-		malloc_report(ASL_LEVEL_INFO, "Internal Security Policy: %d\n",
-				malloc_internal_security_policy);
-	}
+	set_flags_from_environment(); // will only set flags up to two times
 
 
 #if CONFIG_SANITIZER
 	malloc_sanitizer_enabled = sanitizer_should_enable();
 #endif
 	
+#if CONFIG_NANOZONE
 	// TODO: envp should be passed down from Libsystem
 	const char **envp = (const char **)*_NSGetEnviron();
-
-#if CONFIG_NANOZONE
+	
 	// Disable nano when:
 	// - sanitizer is enabled, to avoid speculative out-of-bounds
 	//   use-after-free reads that nano/nanov2 performs, OR
@@ -1447,32 +1357,20 @@
 			!malloc_zero_on_free_sample_period) {
 		nano_common_init(envp, apple, bootargs);
 	}
-#else // CONFIG_NANOZONE
-	(void)envp;
 #endif // CONFIG_NANOZONE
 
-	bool nano_on_xzone = false;
-
-
-	if (!initial_xzone_zone || nano_on_xzone) {
-		if (!initial_xzone_zone) {
-			initial_scalable_zone = create_scalable_zone(0, malloc_debug_flags);
-			malloc_set_zone_name(initial_scalable_zone, DEFAULT_MALLOC_ZONE_STRING);
-			malloc_zone_register_while_locked(initial_scalable_zone, /*make_default=*/true);
-		}
+
+	if (!initial_xzone_zone) {
+		initial_scalable_zone = create_scalable_zone(0, malloc_debug_flags);
+		malloc_set_zone_name(initial_scalable_zone, DEFAULT_MALLOC_ZONE_STRING);
+		malloc_zone_register_while_locked(initial_scalable_zone, /*make_default=*/true);
 
 #if CONFIG_NANOZONE
 		nano_common_configure();
 
-		malloc_zone_t *helper_zone = initial_xzone_zone ?: initial_scalable_zone;
+		malloc_zone_t *helper_zone = initial_scalable_zone;
 
 		if (_malloc_engaged_nano == NANO_V2) {
-			if (malloc_report_config) {
-				bool nano_on_xzone_enabled = (helper_zone == initial_xzone_zone);
-				malloc_report(ASL_LEVEL_INFO, "NanoV2 Config:\n"
-						"\tNano On Xzone: %d\n",
-						nano_on_xzone_enabled);
-			}
 			initial_nano_zone = nanov2_create_zone(helper_zone, malloc_debug_flags);
 		}
 
@@ -1498,45 +1396,20 @@
 
 	initial_num_zones = malloc_num_zones;
 
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
-	mach_vm_reclaim_error_t vmdr_kr = VM_RECLAIM_SUCCESS;
+#if CONFIG_DEFERRED_RECLAIM
 	if (large_cache_enabled) {
-		const bool xzone_deferred_reclaim =
-				CONFIG_XZM_DEFERRED_RECLAIM && initial_xzone_zone;
-		if (xzone_deferred_reclaim) {
+		if (initial_xzone_zone) {
 			// xzone_malloc will own the deferred_reclaim buffer
 			large_cache_enabled = false;
 		} else {
-			vmdr_kr = mvm_deferred_reclaim_init();
-			if (vmdr_kr != VM_RECLAIM_SUCCESS) {
+			kern_return_t kr = mvm_deferred_reclaim_init();
+			if (kr != KERN_SUCCESS) {
 				large_cache_enabled = false;
-				malloc_report(ASL_LEVEL_ERR, "Unable to set up "
-						"reclaim buffer, disabling "
-						"large cache [%d] %s\n",
-						err_get_code(vmdr_kr),
-						mach_error_string(vmdr_kr));
+				malloc_report(ASL_LEVEL_ERR, "Unable to set up reclaim buffer (%d) - disabling large cache\n", kr);
 			}
 		}
 	}
-#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM
-
-	if (malloc_report_config && initial_scalable_zone) {
-		bool scribble = !!(malloc_debug_flags & MALLOC_DO_SCRIBBLE);
-		malloc_report(ASL_LEVEL_INFO, "Magazine Config:\n"
-				"\tMax Magazines: %d\n"
-				"\tMedium Enabled: %d\n"
-				"\tAggressive Madvise: %d\n"
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
-				"\tLarge Cache: %d%s\n"
-#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM
-				"\tScribble: %d\n",
-				max_magazines, magazine_medium_enabled,
-				aggressive_madvise_enabled,
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
-				vmdr_kr ?: large_cache_enabled, vmdr_kr ? " (ERROR)" : "",
-#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM
-				scribble);
-	}
+#endif /* CONFIG_DEFERRED_RECLAIM */
 
 #if CONFIG_MEDIUM_ALLOCATOR
 	uint64_t memsize = platform_hw_memsize();
@@ -1557,20 +1430,17 @@
 }
 
 static bool
-enable_pgm(unsigned flags)
+enable_pgm(void)
 {
 	bool other_debug_tool = has_injected_zone0 || malloc_sanitizer_enabled;
-	// To avoid allocations in the lite helper zone that don't have msl data at
-	// the end of the allocation, don't enable PGM on the lite helper zone
-	bool zone_is_msl = flags & MALLOC_MSL_LITE_WRAPPED_ZONE_FLAGS;
-	return !other_debug_tool && !zone_is_msl && pgm_should_enable();
+	return !other_debug_tool && pgm_should_enable();
 }
 
 static void
 register_pgm_zone(bool internal_diagnostics)
 {
 	pgm_init_config(internal_diagnostics);
-	if (enable_pgm(0)) {
+	if (enable_pgm()) {
 		malloc_zone_t *wrapped_zone = malloc_zones[0];
 		malloc_zone_t *pgm_zone = pgm_create_zone(wrapped_zone);
 		malloc_zone_register_while_locked(pgm_zone, /*make_default=*/true);
@@ -1746,9 +1616,6 @@
 	if (getenv("MallocSimpleStackLogging")) {
 		malloc_simple_stack_logging = true;
 	}
-	if (getenv("MallocReportConfig")) {
-		malloc_report_config = true;
-	}
 
 #if defined(__LP64__)
 /* initialization above forces MALLOC_ABORT_ON_CORRUPTION of 64-bit processes */
@@ -1814,12 +1681,8 @@
 			malloc_report(ASL_LEVEL_INFO, "Maximum magazines defaulted to %d\n", max_magazines);
 #if CONFIG_MAGAZINE_PER_CLUSTER
 		} else if (value == UINT16_MAX) {
-			{
-				max_magazines = ncpuclusters;
-				malloc_report(ASL_LEVEL_INFO,
-						"Maximum magazines limited to ncpuclusters (%d)\n",
-						max_magazines);
-			}
+			max_magazines = ncpuclusters;
+			malloc_report(ASL_LEVEL_INFO, "Maximum magazines limited to number of logical CPU clusters (%d)\n", max_magazines);
 #endif // CONFIG_MAGAZINE_PER_CLUSTER
 		} else if (value < 0) {
 			malloc_report(ASL_LEVEL_ERR, "Maximum magazines must be positive - ignored.\n");
@@ -2017,14 +1880,11 @@
 	}
 
 	flag = getenv("MallocSecureAllocator");
-	if (flag && malloc_internal_security_policy) {
+	if (flag) {
 		const char *endp;
 		long value = malloc_common_convert_to_long(flag, &endp);
 		if (!*endp && endp != flag && (value == 0 || value == 1)) {
 			malloc_xzone_enabled = value;
-			malloc_xzone_enabled_override = value ?
-					MALLOC_XZONE_OVERRIDE_ENABLED :
-					MALLOC_XZONE_OVERRIDE_DISABLED;
 		} else {
 			malloc_report(ASL_LEVEL_ERR, "MallocSecureAllocator must be 0 or 1.\n");
 		}
@@ -2035,26 +1895,12 @@
 		const char *endp;
 		long value = malloc_common_convert_to_long(flag, &endp);
 		if (!*endp && endp != flag && (value == 0 || value == 1)) {
-			malloc_xzone_nano_override = value ? MALLOC_XZONE_OVERRIDE_ENABLED :
-					MALLOC_XZONE_OVERRIDE_DISABLED;
+			malloc_xzone_nano_override = value ? MALLOC_XZONE_NANO_ENABLED :
+					MALLOC_XZONE_NANO_DISABLED;
 		} else {
 			malloc_report(ASL_LEVEL_ERR, "MallocSecureAllocatorNano must be 0 or 1.\n");
 		}
 	}
-
-	flag = getenv("MallocNanoOnXzone");
-	if (flag) {
-		const char *endp;
-		long value = malloc_common_convert_to_long(flag, &endp);
-		if (!*endp && endp != flag && (value == 0 || value == 1)) {
-			malloc_nano_on_xzone_override = value ? MALLOC_XZONE_OVERRIDE_ENABLED :
-					MALLOC_XZONE_OVERRIDE_DISABLED;
-		} else {
-			malloc_report(ASL_LEVEL_ERR, "MallocNanoOnXzone must be 0 or 1.\n");
-		}
-	}
-
-
 
 	if (getenv("MallocHelp")) {
 		malloc_report(ASL_LEVEL_INFO,
@@ -2086,28 +1932,22 @@
 malloc_zone_t *
 malloc_create_zone(vm_size_t start_size, unsigned flags)
 {
-	malloc_zone_t *zone = NULL;
+	malloc_zone_t *zone;
 
 	/* start_size doesn't actually appear to be used, but we test anyway. */
 	if (start_size > malloc_absolute_max_size) {
 		return NULL;
 	}
 
-
-	if (!zone) {
-		zone = create_scalable_zone(start_size, flags | malloc_debug_flags);
-	}
-
-	if (enable_pgm(flags)) {
-		malloc_zone_t *pgm_zone = pgm_create_zone(zone);
-		MALLOC_LOCK();
-		malloc_zone_register_while_locked(pgm_zone, false);
-		malloc_zone_register_while_locked(zone, false);
-		MALLOC_UNLOCK();
-		return pgm_zone;
-	}
-
+	zone = create_scalable_zone(start_size, flags | malloc_debug_flags);
 	malloc_zone_register(zone);
+
+#if CONFIG_PGM_WRAP_CUSTOM_ZONES
+	if (enable_pgm()) {
+		zone = pgm_create_zone(zone);
+		malloc_zone_register(zone);
+	}
+#endif
 	return zone;
 }
 
@@ -2306,10 +2146,6 @@
 		return NULL;
 	}
 
-	if (zone->version >= 16) {
-		return zone->malloc_type_malloc(zone, size,
-				malloc_callsite_fallback_type_id());
-	}
 
 	// zone versions >= 13 set errno on failure so we can tail-call
 	return zone->malloc(zone, size);
@@ -2389,10 +2225,6 @@
 		return _malloc_zone_calloc_instrumented_or_legacy(zone, num_items, size, mzo);
 	}
 
-	if (zone->version >= 16) {
-		return zone->malloc_type_calloc(zone, num_items, size,
-				malloc_callsite_fallback_type_id());
-	}
 
 	// zone versions >= 13 set errno on failure so we can tail-call
 	return zone->calloc(zone, num_items, size);
@@ -2468,8 +2300,8 @@
 // We have this function so code within libmalloc can call it without going
 // through the (potentially interposed) dyld symbol stub
 void *
-_malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size,
-		malloc_type_descriptor_t type_desc)
+_malloc_zone_realloc(malloc_zone_t *zone, void * __unsafe_indexable ptr,
+		size_t size, malloc_type_descriptor_t type_desc)
 {
 	uint64_t type_id = malloc_get_tsd_type_id();
 #if MALLOC_TARGET_64BIT
@@ -2523,7 +2355,8 @@
 
 MALLOC_NOINLINE
 void *
-malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size)
+malloc_zone_realloc(malloc_zone_t *zone, void * __unsafe_indexable ptr,
+		size_t size)
 {
 	return _malloc_zone_realloc(zone, ptr, size,
 			malloc_callsite_fallback_type_descriptor());
@@ -2573,7 +2406,7 @@
 	if (!ptr) {
 		return NULL;
 	} else {
-		return _find_registered_zone(ptr, NULL, false);
+		return find_registered_zone(ptr, NULL, false);
 	}
 }
 
@@ -2752,12 +2585,11 @@
 malloc_set_zone_name(malloc_zone_t *z, const char *name)
 {
 	// TODO: save and restore permissions generally
-	bool mprotect_zone = true;
-	if (mprotect_zone) {
+	if (z != initial_xzone_zone) {
 		mprotect(z, sizeof(malloc_zone_t), PROT_READ | PROT_WRITE);
 	}
 	if (z->zone_name) {
-		malloc_zone_t *old_zone = _find_registered_zone(z->zone_name, NULL, false);
+		malloc_zone_t *old_zone = find_registered_zone(z->zone_name, NULL, false);
 		if (old_zone) {
 			malloc_zone_free(old_zone, (char *)z->zone_name);
 		}
@@ -2797,7 +2629,7 @@
 			}
 		}
 	}
-	if (mprotect_zone) {
+	if (z != initial_xzone_zone) {
 		mprotect(z, sizeof(malloc_zone_t), PROT_READ);
 	}
 }
@@ -2817,13 +2649,14 @@
 		return;
 	}
 
-	zone = _find_registered_zone(ptr, &size, known_non_default);
+	zone = find_registered_zone(ptr, &size, known_non_default);
 	if (!zone) {
 		int flags = MALLOC_REPORT_DEBUG | MALLOC_REPORT_NOLOG;
 		if ((malloc_debug_flags & (MALLOC_ABORT_ON_CORRUPTION | MALLOC_ABORT_ON_ERROR))) {
 			flags = MALLOC_REPORT_CRASH | MALLOC_REPORT_NOLOG;
 		}
-		malloc_report_pointer_was_not_allocated(flags, ptr);
+		malloc_report(flags,
+				"*** error for object %p: pointer being freed was not allocated\n", ptr);
 	} else if (zone->version >= 6 && zone->free_definite_size) {
 		malloc_zone_free_definite_size(zone, ptr, size);
 	} else {
@@ -2872,6 +2705,7 @@
 		find_zone_and_free(ptr, false);
 		return;
 	}
+
 
 	if (zone0->try_free_default) {
 		zone0->try_free_default(zone0, ptr);
@@ -2911,16 +2745,12 @@
 	// We don't really care about the quality of the type descriptor
 	// for the new_size == 0 allocation, so it's fine for it to always be based
 	// on the callsite in this function.
-	//
-	// Note: the fact that we allocate from the default zone in the
-	// new_size == 0 case regardless of the zone in_ptr belongs to is arguably a
-	// bug.
 	if (!in_ptr) {
 		return _malloc_zone_malloc(default_zone, new_size, MZ_POSIX);
 	} else if (new_size == 0) {
 		retval = _malloc_zone_malloc(default_zone, new_size, MZ_NONE);
 	} else {
-		zone = _find_registered_zone(in_ptr, NULL, false);
+		zone = find_registered_zone(in_ptr, NULL, false);
 		if (!zone) {
 			int flags = MALLOC_REPORT_DEBUG | MALLOC_REPORT_NOLOG;
 			const int abort_flags =
@@ -2928,7 +2758,8 @@
 			if (malloc_debug_flags & abort_flags) {
 				flags = MALLOC_REPORT_CRASH | MALLOC_REPORT_NOLOG;
 			}
-			malloc_report_pointer_was_not_allocated(flags, in_ptr);
+			malloc_report(flags, "*** error for object %p: "
+					"pointer being realloc'd was not allocated\n", in_ptr);
 		} else {
 			retval = _malloc_zone_realloc(zone, in_ptr, new_size,
 					malloc_callsite_fallback_type_descriptor());
@@ -2957,12 +2788,7 @@
 	void *ptr = realloc(in_ptr, new_size);
 
 	if (!ptr && in_ptr && new_size != 0) {
-		// Save and restore `errno`, because `realloc` will set it to ENOMEM
-		// on allocation failure, but it could be overwritten if `free` calls
-		// into a library function that also modifies `errno`
-		errno_t error = errno;
 		free(in_ptr);
-		errno = error;
 	}
 
 	return ptr;
@@ -2990,7 +2816,7 @@
 		return size;
 	}
 
-	(void)_find_registered_zone(ptr, &size, false);
+	(void)find_registered_zone(ptr, &size, false);
 	return size;
 }
 
@@ -3122,8 +2948,8 @@
 		zone = runtime_default_zone();
 	}
 
+	uint64_t type_id = malloc_get_tsd_type_id();
 #if MALLOC_TARGET_64BIT
-	uint64_t type_id = malloc_get_tsd_type_id();
 	bool clear_type = false;
 	if (!type_id) {
 		malloc_type_descriptor_t fallback =
@@ -3134,21 +2960,10 @@
 	}
 #endif // MALLOC_TARGET_64BIT
 
-	if (malloc_interposition_compat || (zone->version < 15) ||
-			!zone->malloc_with_options) {
+	if (malloc_interposition_compat || (zone->version < 15)) {
 		// There's no reasonable way to have the fallback callsite type
 		// descriptor work here.  That's okay, as it's uncommon and SPI, so its
 		// callers should be built with TMO.
-		const malloc_options_np_t known_options = MALLOC_NP_OPTION_CLEAR
-				;
-		if (options & ~known_options) {
-			malloc_zone_error(MALLOC_ABORT_ON_ERROR, true,
-					"malloc_zone_malloc_with_options: unsupported options 0x%llx\n",
-					options);
-			__builtin_trap();
-		}
-
-
 		if (align) {
 			ptr = malloc_zone_memalign(zone, align, size);
 			if (ptr && (options & MALLOC_NP_OPTION_CLEAR)) {
@@ -3159,7 +2974,6 @@
 		} else {
 			ptr = malloc_zone_malloc(zone, size);
 		}
-
 	} else {
 		MALLOC_TRACE(TRACE_malloc_options | DBG_FUNC_START, (uintptr_t)zone,
 				align, size, 0);
@@ -3209,10 +3023,6 @@
 		zone = malloc_zones[0];
 	}
 
-	if (zone->version >= 16 && zone->malloc_type_malloc_with_options) {
-		return zone->malloc_type_malloc_with_options(zone, align, size,
-				options, malloc_callsite_fallback_type_id());
-	}
 
 	return _malloc_zone_malloc_with_options_np_outlined(zone, align, size,
 			options);
@@ -3223,7 +3033,6 @@
 static void
 _malloc_create_purgeable_zone(void * __unused ctx)
 {
-
 	//
 	// PR_7288598: Must pass a *scalable* zone (szone) as the helper for create_purgeable_zone().
 	// Take care that the zone so obtained is not subject to interposing.
@@ -3268,7 +3077,7 @@
 	 * and only search those.
 	 */
 	size_t size = 0;
-	malloc_zone_t *zone = _find_registered_zone(ptr, &size, false);
+	malloc_zone_t *zone = find_registered_zone(ptr, &size, false);
 
 	/* FIXME: would really like a zone->introspect->flags->purgeable check, but haven't determined
 	 * binary compatibility impact of changing the introspect struct yet. */
@@ -3329,11 +3138,11 @@
 void
 malloc_memory_event_handler(unsigned long event)
 {
-#if CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_MAGAZINE_DEFERRED_RECLAIM)
+#if CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM)
 	if (event & MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF) {
 		malloc_zone_pressure_relief(0, 0);
 	}
-#endif /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_MAGAZINE_DEFERRED_RECLAIM) */
+#endif /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM) */
 
 	if ((event & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 && (event & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0) {
 		malloc_register_stack_logger();
@@ -3694,14 +3503,6 @@
 		malloc_zone_t *zone = malloc_zones[index++];
 		zone->introspect->force_lock(zone);
 	}
-#if CONFIG_XZONE_MALLOC
-	// All of the xzone malloc zones share some global state, and that global
-	// state needs to be locked after all the zone specific state has been
-	// locked, to prevent deadlocks
-	if (initial_xzone_zone) {
-		xzm_force_lock_global_state(initial_xzone_zone);
-	}
-#endif // CONFIG_XZONE_MALLOC
 	if (callout) {
 		callout();
 	}
@@ -3710,11 +3511,6 @@
 static void
 _malloc_unlock_all(void (*callout)(void))
 {
-#if CONFIG_XZONE_MALLOC
-	if (initial_xzone_zone) {
-		xzm_force_unlock_global_state(initial_xzone_zone);
-	}
-#endif // CONFIG_XZONE_MALLOC
 	unsigned index = 0;
 	if (callout) {
 		callout();
@@ -3732,11 +3528,6 @@
 static void
 _malloc_reinit_lock_all(void (*callout)(void))
 {
-#if CONFIG_XZONE_MALLOC
-	if (initial_xzone_zone) {
-		xzm_force_reinit_lock_global_state(initial_xzone_zone);
-	}
-#endif // CONFIG_XZONE_MALLOC
 	unsigned index = 0;
 	if (callout) {
 		callout();
@@ -3893,12 +3684,6 @@
 #endif
 }
 
-bool
-malloc_allows_internal_security_4test(void)
-{
-	return malloc_internal_security_policy;
-}
-
 /*****************	OBSOLETE ENTRY POINTS	********************/
 
 #ifndef PHASE_OUT_OLD_MALLOC
@@ -3941,6 +3726,13 @@
 #pragma mark -
 #pragma mark Malloc Thread Options
 
+typedef union {
+	malloc_thread_options_t options;
+	void *storage;
+} th_opts_t;
+
+MALLOC_STATIC_ASSERT(sizeof(th_opts_t) == sizeof(void *), "Options fit into pointer bits");
+
 malloc_thread_options_t
 malloc_get_thread_options(void)
 {
@@ -3951,12 +3743,6 @@
 void
 malloc_set_thread_options(malloc_thread_options_t opts)
 {
-	if (os_unlikely(opts.ReservedFlag)) {
-		malloc_zone_error(MALLOC_ABORT_ON_ERROR, true,
-				"malloc_zone_malloc_with_options: reserved TSD bit set\n");
-		__builtin_trap();
-	}
-
 	// Canonicalize options
 	if (opts.DisableExpensiveDebuggingOptions) {
 		opts.DisableProbabilisticGuardMalloc = true;
@@ -3965,7 +3751,8 @@
 
 	pgm_thread_set_disabled(opts.DisableProbabilisticGuardMalloc);
 
-	_malloc_set_thread_options(opts);
+	th_opts_t x = {.options = opts};
+	_pthread_setspecific_direct(__TSD_MALLOC_THREAD_OPTIONS, x.storage);
 }
 
 #pragma mark -
@@ -3989,8 +3776,7 @@
 		if (0==strncmp(*e, "MallocStackLogging", 18)) {
 			_malloc_register_stack_logger(true);
 			if (msl.set_flags_from_environment) {
-				// rdar://125495815 - re-fetch env, as it may have moved
-				msl.set_flags_from_environment((const char **)*_NSGetEnviron());
+				msl.set_flags_from_environment(env);
 			}
 			break;
 		}
@@ -4012,6 +3798,7 @@
 	if (!dylib) {
 		return;
 	}
+	msld.dylib = dylib;
 	msl.handle_memory_event = _dlsym(dylib, "msl_handle_memory_event");
 	msl.stack_logging_locked = _dlsym(dylib, "msl_stack_logging_locked");
 	msl.fork_prepare = _dlsym(dylib, "msl_fork_prepare");
@@ -4022,6 +3809,13 @@
 	msl.set_flags_from_environment = _dlsym(dylib, "msl_set_flags_from_environment");
 	msl.initialize = _dlsym(dylib, "msl_initialize");
 
+	
+	// TODO delete these ones
+	msld.get_frames_for_address = _dlsym(dylib, "msl_get_frames_for_address");
+	msld.stackid_for_vm_region = _dlsym(dylib, "msl_stackid_for_vm_region");
+	msld.get_frames_for_stackid = _dlsym(dylib, "msl_get_frames_for_stackid");
+	msld.uniquing_table_read_stack = _dlsym(dylib, "msl_uniquing_table_read_stack");
+
 	void (*msl_copy_msl_lite_hooks) (struct _malloc_msl_lite_hooks_s *hooksp, size_t size);
 	msl_copy_msl_lite_hooks = _dlsym(dylib, "msl_copy_msl_lite_hooks");
 	if (msl_copy_msl_lite_hooks) {
@@ -4098,6 +3892,227 @@
 	}
 }
 
+//deprecated
+kern_return_t
+__mach_stack_logging_start_reading(task_t task, vm_address_t shared_memory_address, boolean_t *uses_lite_mode)
+{
+	malloc_register_stack_logger();
+	if (!msld.dylib) {
+		return KERN_FAILURE;
+	}
+	kern_return_t (*f) (task_t task, vm_address_t shared_memory_address, boolean_t *uses_lite_mode);
+	f = _dlsym(msld.dylib, "msl_start_reading");
+	if (!f) {
+		return KERN_FAILURE;
+	}
+	return f(task, shared_memory_address, uses_lite_mode);
+}
+
+
+//deprecated
+kern_return_t
+__mach_stack_logging_stop_reading(task_t task)
+{
+	malloc_register_stack_logger();
+	if (!msld.dylib) {
+		return KERN_FAILURE;
+	}
+	kern_return_t (*f) (task_t task);
+	f = _dlsym(msld.dylib, "msl_stop_reading");
+	if (!f) {
+		return KERN_FAILURE;
+	}
+	return f(task);
+}
+
+kern_return_t
+__mach_stack_logging_get_frames(task_t task,
+								mach_vm_address_t address,
+								mach_vm_address_t *stack_frames_buffer,
+								uint32_t max_stack_frames,
+								uint32_t *count)
+{
+	malloc_register_stack_logger();
+	if (!msld.get_frames_for_address) {
+		return KERN_FAILURE;
+	}
+	return msld.get_frames_for_address(task, address, stack_frames_buffer, max_stack_frames, count);
+}
+
+uint64_t
+__mach_stack_logging_stackid_for_vm_region(task_t task, mach_vm_address_t address)
+{
+	malloc_register_stack_logger();
+	if (!msld.stackid_for_vm_region) {
+		return -1ull;
+	}
+	return msld.stackid_for_vm_region(task, address);
+}
+
+//deprecated
+kern_return_t
+__mach_stack_logging_frames_for_uniqued_stack(task_t task,
+											  uint64_t stack_identifier,
+											  mach_vm_address_t *stack_frames_buffer,
+											  uint32_t max_stack_frames,
+											  uint32_t *count)
+{
+	malloc_register_stack_logger();
+	if (!msld.get_frames_for_stackid) {
+		return KERN_FAILURE;
+	}
+	return msld.get_frames_for_stackid(task, stack_identifier, stack_frames_buffer, max_stack_frames, count, NULL);
+}
+
+//deprecated
+kern_return_t
+__mach_stack_logging_get_frames_for_stackid(task_t task,
+											uint64_t stack_identifier,
+											mach_vm_address_t *stack_frames_buffer,
+											uint32_t max_stack_frames,
+											uint32_t *count,
+											bool *last_frame_is_threadid)
+{
+	malloc_register_stack_logger();
+	if (!msld.get_frames_for_stackid) {
+		return KERN_FAILURE;
+	}
+	return msld.get_frames_for_stackid(task, stack_identifier, stack_frames_buffer, max_stack_frames, count, last_frame_is_threadid);
+}
+
+//deprecated
+kern_return_t
+__mach_stack_logging_uniquing_table_read_stack(struct backtrace_uniquing_table *uniquing_table,
+											   uint64_t stackid,
+											   mach_vm_address_t *out_frames_buffer,
+											   uint32_t *out_frames_count,
+											   uint32_t max_frames)
+{
+	malloc_register_stack_logger();
+	if (!msld.uniquing_table_read_stack) {
+		return KERN_FAILURE;
+	}
+	return msld.uniquing_table_read_stack(uniquing_table, stackid, out_frames_buffer, out_frames_count, max_frames);
+}
+
+//deprecated
+kern_return_t
+__mach_stack_logging_enumerate_records(task_t task,
+									   mach_vm_address_t address,
+									   void enumerator(mach_stack_logging_record_t, void *),
+									   void *context)
+{
+	malloc_register_stack_logger();
+	kern_return_t (*f) (task_t task,
+						mach_vm_address_t address,
+						void enumerator(mach_stack_logging_record_t, void *),
+						void *context);
+	if (!msld.dylib) {
+		return KERN_FAILURE;
+	}
+	f = _dlsym(msld.dylib, "msl_disk_stack_logs_enumerate_from_task");
+	if (!f) {
+		return KERN_FAILURE;
+	}
+	return f(task, address, enumerator, context);
+}
+
+
+//deprecated
+struct backtrace_uniquing_table *
+__mach_stack_logging_copy_uniquing_table(task_t task)
+{
+	malloc_register_stack_logger();
+	struct backtrace_uniquing_table * (*f) (task_t task);
+	if (!msld.dylib) {
+		return NULL;
+	}
+	f = _dlsym(msld.dylib, "msl_uniquing_table_copy_from_task");
+	if (!f) {
+		return NULL;
+	}
+	return f(task);
+}
+
+//deprecated
+struct backtrace_uniquing_table *
+__mach_stack_logging_uniquing_table_copy_from_serialized(void *buffer, size_t size)
+{
+	malloc_register_stack_logger();
+	struct backtrace_uniquing_table * (*f) (void *buffer, size_t size);
+	if (!msld.dylib) {
+		return NULL;
+	}
+	f = _dlsym(msld.dylib, "msl_uniquing_table_copy_from_serialized");
+	if (!f) {
+		return NULL;
+	}
+	return f(buffer, size);
+}
+
+//deprecated
+void
+__mach_stack_logging_uniquing_table_release(struct backtrace_uniquing_table *table)
+{
+	malloc_register_stack_logger();
+	if (!msld.dylib) {
+		return;
+	}
+	void (*f) (struct backtrace_uniquing_table *table);
+	f = _dlsym(msld.dylib, "msl_uniquing_table_release");
+	if (f) {
+		f(table);
+	}
+}
+
+//deprecated
+void
+__mach_stack_logging_uniquing_table_retain(struct backtrace_uniquing_table *table)
+{
+	malloc_register_stack_logger();
+	if (!msld.dylib) {
+		return;
+	}
+	void (*f) (struct backtrace_uniquing_table *table);
+	f = _dlsym(msld.dylib, "msl_uniquing_table_retain");
+	if (f) {
+		f(table);
+	}
+}
+
+//deprecated
+extern
+size_t
+__mach_stack_logging_uniquing_table_sizeof(struct backtrace_uniquing_table *table)
+{
+	malloc_register_stack_logger();
+	size_t (*f) (struct backtrace_uniquing_table *table);
+	f = _dlsym(msld.dylib, "msl_uniquing_table_retain");
+	return f(table);
+}
+
+//deprecated
+void *
+__mach_stack_logging_uniquing_table_serialize(struct backtrace_uniquing_table *table, mach_vm_size_t *size)
+{
+	malloc_register_stack_logger();
+	if (!msld.dylib) {
+		return NULL;
+	}
+	void * (*f) (struct backtrace_uniquing_table *table, mach_vm_size_t *size);
+	f = _dlsym(msld.dylib, "msl_uniquing_table_serialize");
+	if (!f) {
+		return NULL;
+	}
+	return f(table, size);
+}
+
+kern_return_t
+__mach_stack_logging_set_file_path(task_t task, char* file_path)
+{
+	return KERN_SUCCESS;
+}
+
 /* WeChat references this, only god knows why.  This symbol does nothing. */
 int stack_logging_enable_logging = 0;