Loading...
--- libmalloc/libmalloc-792.60.6/src/malloc.c
+++ libmalloc/libmalloc-646.40.3/src/malloc.c
@@ -69,9 +69,6 @@
static malloc_zone_t *default_purgeable_zone;
static bool has_injected_zone0;
static bool malloc_xzone_enabled = MALLOC_XZONE_ENABLED_DEFAULT;
-#if CONFIG_XZONE_MALLOC && CONFIG_NANOZONE
-static bool malloc_nano_on_xzone = false;
-#endif // CONFIG_XZONE_MALLOC && CONFIG_NANOZONE
typedef enum {
MALLOC_XZONE_OVERRIDE_DEFAULT,
@@ -79,8 +76,13 @@
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
unsigned malloc_debug_flags = 0;
bool malloc_tracing_enabled = false;
@@ -91,11 +93,6 @@
bool malloc_interposition_compat = false;
-#if CONFIG_MTE
-bool malloc_has_sec_transition = false;
-uint32_t malloc_sec_transition_policy = 0;
-bool malloc_sec_transition_early_malloc_support = false;
-#endif
#if CONFIG_MALLOC_PROCESS_IDENTITY
malloc_process_identity_t malloc_process_identity = MALLOC_PROCESS_NONE;
@@ -131,14 +128,8 @@
static void malloc_sanitizer_fallback_deallocate_poison(uintptr_t ptr, size_t sz);
#endif
/* These masks are exported for libdispatch to register with (see "internal.h") */
-unsigned long malloc_memorypressure_mask_default_4libdispatch = MALLOC_MEMORYPRESSURE_MASK_DEFAULT;
-unsigned long malloc_memorypressure_mask_msl_4libdispatch = MALLOC_MEMORYPRESSURE_MASK_MSL;
-
-#if MALLOC_TARGET_IOS || TARGET_OS_SIMULATOR
-static unsigned long malloc_memorystatus_mask_resource_exception_handling = 0;
-#else
-static unsigned long malloc_memorystatus_mask_resource_exception_handling = MALLOC_MEMORYSTATUS_MASK_RESOURCE_EXCEPTION_HANDLING;
-#endif
+const unsigned long malloc_memorypressure_mask_default_4libdispatch = MALLOC_MEMORYPRESSURE_MASK_DEFAULT;
+const unsigned long malloc_memorypressure_mask_msl_4libdispatch = MALLOC_MEMORYPRESSURE_MASK_MSL;
MALLOC_NOEXPORT malloc_zone_t* lite_zone = NULL;
@@ -170,10 +161,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,15 +188,6 @@
static const char zero_on_free_enabled_boot_arg[] = "malloc_zero_on_free_enabled";
-#if CONFIG_XZONE_MALLOC
-static const char secure_allocator_boot_arg[] = "malloc_secure_allocator";
-
-static
-bool xzm_create_mzones = true;
-
-static
-bool purgeable_zone_use_xzm = true;
-#endif // CONFIG_XZONE_MALLOC
#if CONFIG_MEDIUM_ALLOCATOR
static const char medium_enabled_boot_arg[] = "malloc_medium_zone";
@@ -371,20 +353,6 @@
}
}
-#if CONFIG_XZONE_MALLOC
- flag = malloc_common_value_for_key_copy(bootargs,
- secure_allocator_boot_arg, value_buf, sizeof(value_buf));
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && (value == 0 || value == 1)) {
- malloc_xzone_enabled = (bool)value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_secure_allocator must be 0 or 1 - ignored.\n");
- }
- }
-#endif // CONFIG_XZONE_MALLOC
#if CONFIG_MEDIUM_ALLOCATOR
#if TARGET_OS_OSX
@@ -510,15 +478,11 @@
{ "ExternalQuickLookSatellite-x86_64", MALLOC_PROCESS_QUICKLOOK_MACOS },
#endif // TARGET_OS_OSX
- { "MobileSafari", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.Networking", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.Networking.Development", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.GPU", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.GPU.Development", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.WebContent", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.WebContent.Development", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.WebContent.CaptivePortal", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.WebContent.CaptivePortal.Development", MALLOC_PROCESS_BROWSER, },
+ { "MobileSafari", MALLOC_PROCESS_BROWSER, },
+ { "com.apple.WebKit.Networking", MALLOC_PROCESS_BROWSER, },
+ { "com.apple.WebKit.GPU", MALLOC_PROCESS_BROWSER, },
+ { "com.apple.WebKit.WebContent", MALLOC_PROCESS_BROWSER, },
+ { "com.apple.WebKit.WebContent.CaptivePortal", MALLOC_PROCESS_BROWSER, },
{ "MTLCompilerService", MALLOC_PROCESS_MTLCOMPILERSERVICE },
#if TARGET_OS_OSX
@@ -547,38 +511,10 @@
{ "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
+ { "mds_stores", MALLOC_PROCESS_MDS_STORES },
{ "AegirPoster", MALLOC_PROCESS_AEGIRPOSTER, },
{ "CollectionsPoster", MALLOC_PROCESS_COLLECTIONSPOSTER, },
-
-#if TARGET_OS_WATCH
- { "backboardd", MALLOC_PROCESS_BACKBOARDD, },
- { "ClockFace", MALLOC_PROCESS_CLOCKFACE, },
-#endif // TARGET_OS_WATCH
-
-#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, },
-
- { "VTEncoderXPCService", MALLOC_PROCESS_VTENCODERXPCSERVICE, },
-#endif // TARGET_OS_OSX
-
- { "ReportCrash", MALLOC_PROCESS_REPORTCRASH, },
- { "AudioConverterService", MALLOC_PROCESS_AUDIOCONVERTERSERVICE, },
-
};
if (getpid() == 1) {
@@ -613,12 +549,8 @@
for (size_t i = 0; i < countof(name_identity_mapping); i++) {
if (!strcmp(name, name_identity_mapping[i].name)) {
malloc_process_identity = name_identity_mapping[i].identity;
- return;
- }
- }
-
- if (os_security_config_get() & OS_SECURITY_CONFIG_HARDENED_HEAP) {
- malloc_process_identity = MALLOC_PROCESS_HARDENED_HEAP_CONFIG;
+ break;
+ }
}
}
@@ -627,11 +559,10 @@
#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;
}
@@ -644,7 +575,7 @@
(darwin_default), (simulator_default))
- switch (identity) {
+ switch (malloc_process_identity) {
ENABLEMENT_CASE(LOGD, true);
ENABLEMENT_CASE(NOTIFYD, true);
@@ -669,7 +600,11 @@
ENABLEMENT_CASE(QUICKLOOK_PREVIEW, true);
ENABLEMENT_CASE(QUICKLOOK_THUMBNAIL, true);
+#if TARGET_OS_OSX
+ ENABLEMENT_CASE_FF(MTLCOMPILERSERVICE, MTLCompilerService, false, false);
+#else
ENABLEMENT_CASE(MTLCOMPILERSERVICE, true);
+#endif
ENABLEMENT_CASE(CALLSERVICESD, true);
ENABLEMENT_CASE(MAILD, true);
@@ -696,47 +631,14 @@
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, true, true);
- ENABLEMENT_CASE_FF(BACKBOARDD, backboardd, true, true);
- ENABLEMENT_CASE_FF(WAKEBOARDD, wakeboardd, true, true);
- ENABLEMENT_CASE_FF(REALITYCAMERAD, realitycamerad, true, true);
-#endif
-
ENABLEMENT_CASE_FF(AEGIRPOSTER, aegirposter, false, false);
ENABLEMENT_CASE_FF(COLLECTIONSPOSTER, CollectionsPoster, false, false);
-
-#if TARGET_OS_WATCH
- ENABLEMENT_CASE_FF(BACKBOARDD, backboardd, false, false);
- ENABLEMENT_CASE_FF(CLOCKFACE, ClockFace, false, false);
-#endif
-
-#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
-#if TARGET_OS_OSX
- ENABLEMENT_CASE_FF(VTENCODERXPCSERVICE, VTEncoderXPCService, false, false);
-#endif
-
- ENABLEMENT_CASE(REPORTCRASH, true);
- ENABLEMENT_CASE(AUDIOCONVERTERSERVICE, true);
-
-
- ENABLEMENT_CASE(HARDENED_HEAP_CONFIG, true);
+ ENABLEMENT_CASE(MDS_STORES, true);
default:
return false;
@@ -760,19 +662,17 @@
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 || TARGET_OS_OSX || \
- TARGET_OS_WATCH
+#if MALLOC_TARGET_IOS_ONLY
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 || TARGET_OS_OSX
+#endif // MALLOC_TARGET_IOS_ONLY
}
#if TARGET_OS_OSX && !TARGET_CPU_ARM64
@@ -780,6 +680,14 @@
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
if (secure_allocator != malloc_xzone_enabled) {
malloc_xzone_enabled = secure_allocator;
@@ -828,13 +736,12 @@
}
#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 CONFIG_CHECK_SECURITY_POLICY
+ bool allow_internal_security = _malloc_allow_internal_security_policy();
if (allow_internal_security != malloc_internal_security_policy) {
malloc_internal_security_policy = allow_internal_security;
}
+#endif
#if CONFIG_MALLOC_PROCESS_IDENTITY
_malloc_check_process_identity(apple);
@@ -856,13 +763,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));
@@ -1323,10 +1230,6 @@
/********* Creation and destruction ************/
static void set_flags_from_environment(void);
-#if CONFIG_MTE
-static bool _malloc_check_has_sec_transition(const char *apple[]);
-static uint32_t _malloc_get_sec_transition_policy(const char *apple[]);
-#endif
MALLOC_NOEXPORT void
malloc_zone_register_while_locked(malloc_zone_t *zone, bool make_default)
@@ -1345,30 +1248,14 @@
if (malloc_num_zones == malloc_num_zones_allocated) {
size_t malloc_zones_size = malloc_num_zones * sizeof(malloc_zone_t *);
-
- size_t new_malloc_num_zones_allocated = 0;
- if (malloc_num_zones_allocated == 0) {
- new_malloc_num_zones_allocated =
- vm_page_size / sizeof(malloc_zone_t *);
- } else if (malloc_num_zones_allocated < (1 << 17)) {
- // Double up to 128K zones
- new_malloc_num_zones_allocated = malloc_num_zones_allocated * 2;
- } else {
- // Increment in further batches of 128K zones
- MALLOC_ASSERT(!os_add_overflow(malloc_num_zones_allocated, (1 << 17),
- &new_malloc_num_zones_allocated));
- }
-
- mach_vm_size_t alloc_size = 0;
- MALLOC_ASSERT(!os_mul_overflow(new_malloc_num_zones_allocated,
- sizeof(malloc_zone_t *), &alloc_size));
- alloc_size = round_page(alloc_size);
-
- mach_vm_address_t vm_addr = (mach_vm_address_t)mvm_allocate_plat(
- 0, (size_t)alloc_size, 0, VM_FLAGS_ANYWHERE,
- MALLOC_GUARDED_METADATA, VM_MEMORY_MALLOC, NULL);
- if (vm_addr == 0) {
- malloc_report(ASL_LEVEL_ERR, "malloc_zone_register allocation failed\n");
+ mach_vm_size_t alloc_size = round_page(malloc_zones_size + vm_page_size);
+ mach_vm_address_t vm_addr;
+ int alloc_flags = VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_MEMORY_MALLOC);
+
+ vm_addr = vm_page_size;
+ kern_return_t kr = mach_vm_allocate(mach_task_self(), &vm_addr, alloc_size, alloc_flags);
+ if (kr) {
+ malloc_report(ASL_LEVEL_ERR, "malloc_zone_register allocation failed: %d\n", kr);
return;
}
@@ -1377,14 +1264,16 @@
* out of the previous array and into the new zones array */
if (malloc_zones) {
memcpy(new_zones, malloc_zones, malloc_zones_size);
+ vm_addr = (mach_vm_address_t)malloc_zones;
+ mach_vm_size_t dealloc_size = round_page(malloc_zones_size);
+ mach_vm_deallocate(mach_task_self(), vm_addr, dealloc_size);
}
/* Update the malloc_zones pointer, which we leak if it was previously
* allocated, and the number of zones allocated */
protect_size = (size_t)alloc_size;
malloc_zones = new_zones;
- MALLOC_ASSERT(!os_convert_overflow(new_malloc_num_zones_allocated,
- &malloc_num_zones_allocated));
+ malloc_num_zones_allocated = (int32_t)(alloc_size / sizeof(malloc_zone_t *));
} else {
/* If we don't need to reallocate zones, we need to briefly change the
* page protection the malloc zones to allow writes */
@@ -1433,11 +1322,11 @@
{
phys_ncpus = *(uint8_t *)(uintptr_t)_COMM_PAGE_PHYSICAL_CPUS;
logical_ncpus = *(uint8_t *)(uintptr_t)_COMM_PAGE_LOGICAL_CPUS;
-#if CONFIG_CLUSTER_AWARE
+#if CONFIG_MAGAZINE_PER_CLUSTER
{
ncpuclusters = *(uint8_t *)(uintptr_t)_COMM_PAGE_CPU_CLUSTERS;
}
-#endif // CONFIG_CLUSTER_AWARE
+#endif // CONFIG_MAGAZINE_PER_CLUSTER
if (0 != (logical_ncpus % phys_ncpus)) {
MALLOC_REPORT_FATAL_ERROR(logical_ncpus % phys_ncpus,
@@ -1474,11 +1363,11 @@
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__)
+ // The "single-cluster" concept doesn't apply to macOS: there is no
+ // non-Intel real hardware without multiple AMP clusters, so this will only
+ // happen under virtualization, and for that case we'd prefer the
+ // straight-to-pcpu behaviour rather than falling back to the old allocator.
+#if CONFIG_MAGAZINE_PER_CLUSTER && !(TARGET_OS_OSX || MALLOC_TARGET_DK_OSX)
if (ncpuclusters == 1) {
#if CONFIG_FEATUREFLAGS_SIMPLE
// Not with the other feature flag checks because ncpuclusters needs to
@@ -1492,44 +1381,22 @@
malloc_xzone_enabled = false;
}
}
-#endif
+#endif // CONFIG_MAGAZINE_PER_CLUSTER && !(TARGET_OS_OSX || MALLOC_TARGET_DK_OSX)
_malloc_detect_interposition();
-#if CONFIG_MTE
- malloc_has_sec_transition = _malloc_check_has_sec_transition(apple);
- // If the process has been spawned by setting has_sec_transition=1,
- // enable the usage of xzone and the nano override by default.
- // Note that we still allow overriding this behaviour through
- // environment variables (whose values are loaded afterwards).
- if (malloc_has_sec_transition) {
- malloc_xzone_enabled = true;
- malloc_xzone_nano_override = MALLOC_XZONE_OVERRIDE_ENABLED;
- malloc_sec_transition_early_malloc_support = true;
- malloc_sec_transition_policy = _malloc_get_sec_transition_policy(apple);
- }
-#endif
set_flags_from_environment();
-
- // Add-in mask bits that can be set via env var MallocEnableMSLAtLimitWarning, for libdispatch to setup the desired handlers
- malloc_memorypressure_mask_default_4libdispatch |= malloc_memorystatus_mask_resource_exception_handling;
- malloc_memorypressure_mask_msl_4libdispatch |= malloc_memorystatus_mask_resource_exception_handling;
-
- if (malloc_report_config) {
- malloc_report(ASL_LEVEL_INFO, "Internal Security Policy: %d\n",
- malloc_internal_security_policy);
- }
#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
@@ -1541,107 +1408,10 @@
!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 CONFIG_XZONE_MALLOC
-#if CONFIG_NANOZONE
- bool nano_xzone_enabled = false;
-#if CONFIG_FEATUREFLAGS_SIMPLE
- nano_xzone_enabled = os_feature_enabled_simple(libmalloc,
- SecureAllocator_Nano, MALLOC_XZONE_NANO_ENABLED_DEFAULT);
-#elif MALLOC_TARGET_DK_OSX
- nano_xzone_enabled = true;
-#endif // CONFIG_FEATUREFLAGS_SIMPLE
-
-#if CONFIG_MALLOC_PROCESS_IDENTITY
- if (malloc_process_is_security_critical(malloc_process_identity)) {
- // This is load-bearing for MTLCompilerService
- nano_xzone_enabled = true;
- }
-#endif // CONFIG_MALLOC_PROCESS_IDENTITY
-
- switch (malloc_xzone_nano_override) {
- case MALLOC_XZONE_OVERRIDE_DISABLED:
- nano_xzone_enabled = false;
- break;
- case MALLOC_XZONE_OVERRIDE_ENABLED:
- nano_xzone_enabled = true;
- break;
- default:
- break;
- }
-
- // If we're forcing nano-on-xzone via the environment, take that even if
- // we'd otherwise take the nano config of xzone
- if (malloc_nano_on_xzone_override == MALLOC_XZONE_OVERRIDE_ENABLED) {
- nano_xzone_enabled = false;
- }
-
- if (malloc_xzone_enabled && _malloc_engaged_nano == NANO_V2 &&
- !nano_xzone_enabled) {
-#if TARGET_OS_SIMULATOR
- // Note: simulator processes get nano by default because
- // NANOV2_DEFAULT_MODE is conditioned on MALLOC_TARGET_IOS, which
- // excludes the simulator. So, simulator processes will not get xzone
- // malloc until we either adjust this policy or enable it by default
- // under nano.
- malloc_xzone_enabled = false;
-#else // TARGET_OS_SIMULATOR
-#if CONFIG_FEATUREFLAGS_SIMPLE
- nano_on_xzone = os_feature_enabled_simple(libmalloc,
- SecureAllocator_NanoOnXzone, false);
-#endif // CONFIG_FEATUREFLAGS_SIMPLE
-
- switch (malloc_nano_on_xzone_override) {
- case MALLOC_XZONE_OVERRIDE_DISABLED:
- nano_on_xzone = false;
- break;
- case MALLOC_XZONE_OVERRIDE_ENABLED:
- nano_on_xzone = true;
- break;
- default:
- break;
- }
-
- if (malloc_nano_on_xzone != nano_on_xzone) {
- malloc_nano_on_xzone = nano_on_xzone;
- }
-
- if (!nano_on_xzone) {
- malloc_xzone_enabled = false;
- }
-#endif // TARGET_OS_SIMULATOR
- }
-#endif // CONFIG_NANOZONE
-
- if (malloc_xzone_enabled) {
- mvm_guarded_range_init();
-
- if (malloc_report_config && malloc_internal_security_policy) {
- malloc_report(ASL_LEVEL_INFO,
- "Guarded Range Config (base/size/carveout):"
- " 0x%lx / 0x%lx / 0x%lx\n",
- (unsigned long)malloc_guarded_range_config.base_address,
- (unsigned long)malloc_guarded_range_config.size,
- (unsigned long)malloc_guarded_range_config.carveout_address);
- }
-
- initial_xzone_zone = xzm_main_malloc_zone_create(malloc_debug_flags,
- envp, apple, bootargs);
-
- // Note: although it would be ideal if we could give this zone a unique
- // name that draws attention to the fact that it will not behave like a
- // nano or scalable zone, a lot of code looks specifically for
- // "DefaultMallocZone" when looking for/at the default zone, so that's
- // the name we'll need to continue to take.
- malloc_set_zone_name(initial_xzone_zone, DEFAULT_MALLOC_ZONE_STRING);
- malloc_zone_register_while_locked(initial_xzone_zone, /*make_default=*/true);
- }
-#endif // CONFIG_XZONE_MALLOC
if (!initial_xzone_zone || nano_on_xzone) {
if (!initial_xzone_zone) {
@@ -1687,26 +1457,21 @@
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
+ kern_return_t vmdr_kr = KERN_SUCCESS;
if (large_cache_enabled) {
- const bool xzone_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) {
+ if (vmdr_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", vmdr_kr);
}
}
}
-#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM
+#endif /* CONFIG_DEFERRED_RECLAIM */
if (malloc_report_config && initial_scalable_zone) {
bool scribble = !!(malloc_debug_flags & MALLOC_DO_SCRIBBLE);
@@ -1714,15 +1479,15 @@
"\tMax Magazines: %d\n"
"\tMedium Enabled: %d\n"
"\tAggressive Madvise: %d\n"
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
+#if CONFIG_DEFERRED_RECLAIM
"\tLarge Cache: %d%s\n"
-#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM
+#endif // CONFIG_DEFERRED_RECLAIM
"\tScribble: %d\n",
max_magazines, magazine_medium_enabled,
aggressive_madvise_enabled,
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
+#if CONFIG_DEFERRED_RECLAIM
vmdr_kr ?: large_cache_enabled, vmdr_kr ? " (ERROR)" : "",
-#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM
+#endif // CONFIG_DEFERRED_RECLAIM
scribble);
}
@@ -1855,14 +1620,11 @@
#if TARGET_OS_OSX
// rdar://99288027
- if (dyld_get_active_platform() == PLATFORM_MACOS &&
- !dyld_program_sdk_at_least(dyld_platform_version_macOS_13_0)) {
+ if (!dyld_program_sdk_at_least(dyld_platform_version_macOS_13_0)) {
if (malloc_zero_policy == MALLOC_ZERO_ON_FREE) {
malloc_zero_policy = MALLOC_ZERO_ON_ALLOC;
- malloc_xzone_enabled = false;
- }
- }
-
+ }
+ }
#else // TARGET_OS_OSX
#endif // TARGET_OS_OSX
@@ -2213,6 +1975,9 @@
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");
}
@@ -2242,53 +2007,7 @@
}
}
-#if CONFIG_XZONE_MALLOC
- flag = getenv("MallocSecureAllocatorCreateMzones");
- if (flag && malloc_internal_security_policy) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- xzm_create_mzones = value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "MallocSecureAllocatorCreateMzones must be 0 or 1.\n");
- }
- }
- flag = getenv("MallocSecureAllocatorPurgeableZone");
- if (flag && malloc_internal_security_policy) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- purgeable_zone_use_xzm = value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "MallocSecureAllocatorPurgeableZone must be 0 or 1.\n");
- }
- }
-#endif // CONFIG_XZONE_MALLOC
-
-#if CONFIG_MTE
- flag = getenv("MallocEarlyMallocSecTransitionSupport");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- malloc_sec_transition_early_malloc_support = value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "MallocEarlyMallocSecTransitionSupport must be 0 or 1.\n");
- }
- }
-#endif // CONFIG_MTE
-
- flag = getenv("MallocEnableMSLAtLimitWarning");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && value == 1) {
- malloc_memorystatus_mask_resource_exception_handling |= MALLOC_MEMORYSTATUS_MASK_RESOURCE_EXCEPTION_HANDLING;
- }
- }
+
if (getenv("MallocHelp")) {
malloc_report(ASL_LEVEL_INFO,
@@ -2316,37 +2035,6 @@
}
}
-#if CONFIG_MTE
-static bool
-_malloc_check_has_sec_transition(const char *apple[])
-{
- const char *flag = _simple_getenv(apple, "has_sec_transition");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- return (bool)value;
- }
- }
- return false;
-}
-
-static uint32_t
-_malloc_get_sec_transition_policy(const char *apple[])
-{
- const char *flag = _simple_getenv(apple, "sec_transition_policy");
- uint32_t policy = 0;
- if (flag) {
- char *endp;
- unsigned long value = strtoul(flag, &endp, 0);
- if (!*endp && endp != flag) {
- policy = (uint32_t)value;
- }
- }
- return policy;
-}
-
-#endif // CONFIG_MTE
malloc_zone_t *
malloc_create_zone(vm_size_t start_size, unsigned flags)
@@ -2358,12 +2046,6 @@
return NULL;
}
-#if CONFIG_XZONE_MALLOC
- if (initial_xzone_zone && xzm_create_mzones) {
- zone = xzm_malloc_zone_create(flags | malloc_debug_flags,
- (xzm_main_malloc_zone_t)initial_xzone_zone);
- }
-#endif // CONFIG_XZONE_MALLOC
if (!zone) {
zone = create_scalable_zone(start_size, flags | malloc_debug_flags);
@@ -2883,7 +2565,7 @@
}
// excludes 0 == alignment
// relies on sizeof(void *) being a power of two.
- if (alignment < MALLOC_ZONE_MALLOC_DEFAULT_ALIGN ||
+ if (alignment < sizeof(void *) ||
0 != (alignment & (alignment - 1))) {
err = EINVAL;
goto out;
@@ -3024,11 +2706,6 @@
{
// TODO: save and restore permissions generally
bool mprotect_zone = true;
-#if CONFIG_XZONE_MALLOC
- if (_xzm_malloc_zone_is_xzm(z)) {
- mprotect_zone = false;
- }
-#endif // CONFIG_XZONE_MALLOC
if (mprotect_zone) {
mprotect(z, sizeof(malloc_zone_t), PROT_READ | PROT_WRITE);
}
@@ -3099,21 +2776,8 @@
if ((malloc_debug_flags & (MALLOC_ABORT_ON_CORRUPTION | MALLOC_ABORT_ON_ERROR))) {
flags = MALLOC_REPORT_CRASH | MALLOC_REPORT_NOLOG;
}
-#if CONFIG_MTE
- // When tagging is enabled, this will validate the MTE tag of the
- // pointer and raise a fatal exception if it doesn't match the tag
- // stored in memory.
- //
- // We need to do this here to cover the following deviations along the
- // free() path:
- // - when we are called directly by _free(), in the cases where we can't
- // invoke zone->try_free_default()
- // - in xzone, in the outlined path after the pointer lookup has failed,
- // if we're in a try context
- // - in xzone, from the slow path for try_free_default(), if the zone
- // lookup fails when trying to determine the size of the allocation
-#endif
- 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 {
@@ -3212,22 +2876,14 @@
} else {
zone = _find_registered_zone(in_ptr, NULL, false);
if (!zone) {
-#if CONFIG_MTE
- // This will validate the MTE tag of the pointer: this is required
- // to make sure we raise a fatal exception when trying to reallocate
- // a pointer with an invalid tag.
- // Note that this is the only place where we handle this in the
- // realloc path: for malloc_type_realloc, this means that we only
- // validate the MTE tag when the zone lookup fails in the fast path,
- // or in the slow path only if the symbol has not been interposed.
-#endif
int flags = MALLOC_REPORT_DEBUG | MALLOC_REPORT_NOLOG;
const int abort_flags =
(MALLOC_ABORT_ON_CORRUPTION | MALLOC_ABORT_ON_ERROR);
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());
@@ -3256,12 +2912,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;
@@ -3332,7 +2983,7 @@
// test made in malloc_zone_memalign to vet each request. Only if that test fails
// and returns NULL, do we arrive here to detect the bogus alignment and give the
// required EINVAL return.
- if (alignment < MALLOC_ZONE_MALLOC_DEFAULT_ALIGN || // excludes 0 == alignment
+ if (alignment < sizeof(void *) || // excludes 0 == alignment
0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
return EINVAL;
}
@@ -3412,8 +3063,8 @@
}
void *
-_malloc_zone_malloc_with_options_outlined(malloc_zone_t *zone, size_t align,
- size_t size, malloc_zone_malloc_options_t options)
+_malloc_zone_malloc_with_options_np_outlined(malloc_zone_t *zone, size_t align,
+ size_t size, malloc_options_np_t options)
{
void *ptr = NULL;
@@ -3438,48 +3089,16 @@
// 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_zone_malloc_options_t known_options =
- MALLOC_ZONE_MALLOC_OPTION_CLEAR | MALLOC_NP_OPTION_CANONICAL_TAG;
- 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 CONFIG_MTE
- // rdar://140822174
- // When dyld interposition or a wrapper zone that does not support
- // forwarding malloc options is enabled, we need to set a flag in the
- // TSD to preserve the semantics of canonical tagging.
- malloc_thread_options_t opts;
- if ((options & MALLOC_ZONE_MALLOC_OPTION_CANONICAL_TAG) &&
- malloc_has_sec_transition) {
- opts = malloc_get_thread_options();
- malloc_thread_options_t newopts = opts;
- newopts.ReservedFlag = true;
- _malloc_set_thread_options(newopts);
- }
-#endif // CONFIG_MTE
-
- if (align > MALLOC_ZONE_MALLOC_DEFAULT_ALIGN) {
+ if (align) {
ptr = malloc_zone_memalign(zone, align, size);
- if (ptr && (options & MALLOC_ZONE_MALLOC_OPTION_CLEAR)) {
+ if (ptr && (options & MALLOC_NP_OPTION_CLEAR)) {
memset(ptr, 0, size);
}
- } else if (options & MALLOC_ZONE_MALLOC_OPTION_CLEAR) {
+ } else if (options & MALLOC_NP_OPTION_CLEAR) {
ptr = malloc_zone_calloc(zone, 1, size);
} else {
ptr = malloc_zone_malloc(zone, size);
}
-
-#if CONFIG_MTE
- // Restore the saved TSD flags
- if ((options & MALLOC_ZONE_MALLOC_OPTION_CANONICAL_TAG) &&
- malloc_has_sec_transition) {
- _malloc_set_thread_options(opts);
- }
-#endif // CONFIG_MTE
} else {
MALLOC_TRACE(TRACE_malloc_options | DBG_FUNC_START, (uintptr_t)zone,
align, size, 0);
@@ -3487,7 +3106,7 @@
if (os_unlikely(malloc_logger)) {
uint32_t flags = MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE;
- if (options & MALLOC_ZONE_MALLOC_OPTION_CLEAR) {
+ if (options & MALLOC_NP_OPTION_CLEAR) {
flags |= MALLOC_LOG_TYPE_CLEARED;
}
malloc_logger(flags, (uintptr_t)zone, (uintptr_t)size,
@@ -3512,17 +3131,16 @@
}
void *
-malloc_zone_malloc_with_options(malloc_zone_t *zone, size_t align,
- size_t size, malloc_zone_malloc_options_t options)
-{
- if (align != MALLOC_ZONE_MALLOC_DEFAULT_ALIGN &&
- (os_unlikely((align != 0) && (!powerof2(align) ||
- ((size & (align-1)) != 0))))) { // equivalent to (size % align != 0)
+malloc_zone_malloc_with_options_np(malloc_zone_t *zone, size_t align,
+ size_t size, malloc_options_np_t options)
+{
+ if (os_unlikely((align != 0) && (!powerof2(align) ||
+ ((size & (align-1)) != 0)))) { // equivalent to (size % align != 0)
return NULL;
}
if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_zone_malloc_with_options_outlined(zone, align, size,
+ return _malloc_zone_malloc_with_options_np_outlined(zone, align, size,
options);
}
@@ -3535,15 +3153,8 @@
options, malloc_callsite_fallback_type_id());
}
- return _malloc_zone_malloc_with_options_outlined(zone, align, size,
+ return _malloc_zone_malloc_with_options_np_outlined(zone, align, size,
options);
-}
-
-void * __sized_by_or_null(size)
-malloc_zone_malloc_with_options_np(malloc_zone_t *zone, size_t align,
- size_t size, malloc_options_np_t options)
-{
- return malloc_zone_malloc_with_options(zone, align, size, options);
}
/********* Purgeable zone ************/
@@ -3551,17 +3162,6 @@
static void
_malloc_create_purgeable_zone(void * __unused ctx)
{
-#if CONFIG_XZONE_MALLOC
- if (initial_xzone_zone && purgeable_zone_use_xzm) {
- unsigned flags = malloc_debug_flags | MALLOC_PURGEABLE;
- default_purgeable_zone = xzm_malloc_zone_create(flags,
- (xzm_main_malloc_zone_t)initial_xzone_zone);
- malloc_zone_register(default_purgeable_zone);
- malloc_set_zone_name(default_purgeable_zone,
- DEFAULT_PUREGEABLE_ZONE_STRING);
- return;
- }
-#endif // CONFIG_XZONE_MALLOC
//
// PR_7288598: Must pass a *scalable* zone (szone) as the helper for create_purgeable_zone().
@@ -3668,19 +3268,21 @@
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();
}
- if (event & malloc_memorystatus_mask_resource_exception_handling) {
+#if ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING
+ if (event & MALLOC_MEMORYSTATUS_MASK_RESOURCE_EXCEPTION_HANDLING) {
malloc_register_stack_logger();
}
+#endif /* ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING */
if (msl.handle_memory_event) {
// Let MSL see the event.
@@ -4230,12 +3832,6 @@
#endif
}
-bool
-malloc_allows_internal_security_4test(void)
-{
- return malloc_internal_security_policy;
-}
-
/***************** OBSOLETE ENTRY POINTS ********************/
#ifndef PHASE_OUT_OLD_MALLOC
@@ -4278,6 +3874,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)
{
@@ -4288,12 +3891,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;
@@ -4302,7 +3899,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 -
@@ -4344,11 +3942,6 @@
register_msl_dylib(void *dylib)
{
#if TARGET_OS_DRIVERKIT
- // rdar://153673319
- if (!msl.copy_msl_lite_hooks) {
- return;
- }
-
set_msl_lite_hooks(msl.copy_msl_lite_hooks);
#else
if (!dylib) {