Loading...
--- libmalloc/libmalloc-474.0.13/src/malloc.c
+++ libmalloc/libmalloc-715.120.13/src/malloc.c
@@ -21,6 +21,13 @@
* @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
@@ -61,7 +68,21 @@
malloc_zone_t *initial_xzone_zone;
static malloc_zone_t *default_purgeable_zone;
static bool has_injected_zone0;
-static bool malloc_xzone_enabled;
+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
unsigned malloc_debug_flags = 0;
bool malloc_tracing_enabled = false;
@@ -71,6 +92,7 @@
bool malloc_sanitizer_enabled = false;
bool malloc_interposition_compat = false;
+
#if CONFIG_MALLOC_PROCESS_IDENTITY
malloc_process_identity_t malloc_process_identity = MALLOC_PROCESS_NONE;
@@ -86,7 +108,7 @@
#define MALLOC_SIMPLE_STACK_LOGGING_FLAGS \
(ASL_LEVEL_NOTICE | MALLOC_REPORT_NOPREFIX | MALLOC_REPORT_BACKTRACE | MALLOC_REPORT_NOWRITE)
-static bool malloc_slowpath = false;
+bool malloc_slowpath = false;
static struct _malloc_msl_symbols msl = {};
@@ -108,36 +130,6 @@
/* 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;
@@ -169,10 +161,10 @@
MALLOC_NOEXPORT
unsigned int logical_ncpus;
-#if CONFIG_MAGAZINE_PER_CLUSTER
+#if CONFIG_CLUSTER_AWARE
MALLOC_NOEXPORT
unsigned int ncpuclusters;
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
+#endif // CONFIG_CLUSTER_AWARE
MALLOC_NOEXPORT
unsigned int hyper_shift;
@@ -205,6 +197,9 @@
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;
@@ -230,13 +225,13 @@
lite_zone ||
malloc_tracing_enabled ||
malloc_simple_stack_logging ||
+ (malloc_debug_flags & MALLOC_DO_SCRIBBLE) != 0 ||
malloc_interposition_compat;
if (malloc_slowpath != slowpath) {
malloc_slowpath = slowpath;
}
}
-
void __malloc_init(const char *apple[]);
static void _malloc_initialize(const char *apple[], const char *bootargs);
@@ -433,7 +428,7 @@
#if CONFIG_MALLOC_PROCESS_IDENTITY
static void
-_malloc_check_process_identity(void)
+_malloc_check_process_identity(const char *apple[])
{
static const struct {
const char *name;
@@ -458,6 +453,7 @@
{ "audiomxd", MALLOC_PROCESS_AUDIOMXD, },
{ "avconferenced", MALLOC_PROCESS_AVCONFERENCED, },
{ "mediaserverd", MALLOC_PROCESS_MEDIASERVERD, },
+ { "cameracaptured", MALLOC_PROCESS_CAMERACAPTURED, },
{ "MessagesBlastDoorService", MALLOC_PROCESS_BLASTDOOR_MESSAGES, },
{ "MessagesAirlockService", MALLOC_PROCESS_BLASTDOOR_MESSAGES, },
@@ -469,12 +465,38 @@
{ "com.apple.quicklook.extension.previewUI", MALLOC_PROCESS_QUICKLOOK_PREVIEW, },
{ "QuickLookUIExtension", MALLOC_PROCESS_QUICKLOOK_PREVIEW, },
{ "ThumbnailExtension", MALLOC_PROCESS_QUICKLOOK_THUMBNAIL },
-
- { "com.apple.WebKit.Networking", MALLOC_PROCESS_WEBKIT_NETWORKING, },
- { "com.apple.WebKit.GPU", MALLOC_PROCESS_WEBKIT_GPU, },
+#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, },
+ { "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 },
- { "com.apple.WebKit.WebContent", MALLOC_PROCESS_WEBKIT_WEBCONTENT, },
- { "com.apple.WebKit.WebContent.CaptivePortal", MALLOC_PROCESS_WEBKIT_WEBCONTENT, },
+
+#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
{ "callservicesd", MALLOC_PROCESS_CALLSERVICESD, },
{ "maild", MALLOC_PROCESS_MAILD, },
@@ -488,11 +510,56 @@
{ "CommCenter", MALLOC_PROCESS_COMMCENTER, },
{ "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) {
malloc_process_identity = MALLOC_PROCESS_LAUNCHD;
return;
+ }
+
+ const char *flag = _simple_getenv(apple, "HardenedRuntime");
+ if (flag) {
+ unsigned long long value = strtoull(flag, NULL, 0);
+ if (value) {
+ // reproduced from xnu
+ enum {
+ MallocBrowserHostEntitlementMask = 0x01,
+ MallocBrowserGPUEntitlementMask = 0x02,
+ MallocBrowserNetworkEntitlementMask = 0x04,
+ MallocBrowserWebContentEntitlementMask = 0x08,
+ };
+
+ long enablement_mask = MallocBrowserHostEntitlementMask |
+ MallocBrowserGPUEntitlementMask |
+ MallocBrowserNetworkEntitlementMask |
+ MallocBrowserWebContentEntitlementMask;
+ if (value & enablement_mask) {
+ malloc_process_identity = MALLOC_PROCESS_BROWSER;
+ return;
+ }
+ }
}
const char *name = getprogname();
@@ -509,68 +576,101 @@
#endif
static bool
-_malloc_check_secure_allocator_process_enablement(void)
+_malloc_check_secure_allocator_process_enablement(
+ malloc_process_identity_t identity)
{
// launchd is special because the feature flag check can't work for it
- if (malloc_process_identity == MALLOC_PROCESS_LAUNCHD) {
+ if (identity == MALLOC_PROCESS_LAUNCHD) {
return MALLOC_SECURE_ALLOCATOR_LAUNCHD_ENABLED_DEFAULT;
}
- 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) \
+#define ENABLEMENT_CASE(id, enable_status) \
case MALLOC_PROCESS_##id: \
- 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(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(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(WEBKIT_NETWORKING, WebKit_Networking, true);
- ENABLEMENT_CASE(WEBKIT_GPU, WebKit_GPU, true);
- ENABLEMENT_CASE(WEBKIT_WEBCONTENT, WebKit_WebContent, true);
+ 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
default:
return false;
@@ -591,18 +691,41 @@
MALLOC_ZERO_ON_FREE : MALLOC_ZERO_NONE;
}
- bool secure_allocator = os_feature_enabled_simple(libmalloc,
- SecureAllocator_SystemWide, false);
+ bool secure_allocator = false;
#if CONFIG_MALLOC_PROCESS_IDENTITY
- if (!secure_allocator && malloc_process_identity != MALLOC_PROCESS_NONE) {
- secure_allocator = _malloc_check_secure_allocator_process_enablement();
- }
-#endif
+ if (malloc_process_identity != MALLOC_PROCESS_NONE) {
+ secure_allocator =
+ _malloc_check_secure_allocator_process_enablement(malloc_process_identity);
+ } 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
if (secure_allocator != malloc_xzone_enabled) {
malloc_xzone_enabled = secure_allocator;
}
-#endif
+#endif // CONFIG_FEATUREFLAGS_SIMPLE
}
extern malloc_zone_t *force_asan_init_if_present(void)
@@ -639,8 +762,23 @@
// 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();
+ _malloc_check_process_identity(apple);
#endif
_malloc_init_featureflags();
@@ -659,13 +797,13 @@
if (strstr(*p, LIBMALLOC_EXPERIMENT_FACTORS_KEY) == *p) {
malloc_experiments = *p;
}
-#if CONFIG_DEFERRED_RECLAIM
+#if CONFIG_MAGAZINE_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_DEFERRED_RECLAIM */
+#endif /* CONFIG_MAGAZINE_DEFERRED_RECLAIM */
}
if (!_malloc_entropy_initialized) {
getentropy((void*)malloc_entropy, sizeof(malloc_entropy));
@@ -735,7 +873,7 @@
MALLOC_ALWAYS_INLINE
static inline malloc_zone_t *
-runtime_default_zone() {
+runtime_default_zone(void) {
return (lite_zone) ? lite_zone : inline_malloc_default_zone();
}
@@ -973,7 +1111,7 @@
default_zone_malloc_claimed_address,
};
-static malloc_zone_t *default_zone = &virtual_default_zone.malloc_zone;
+MALLOC_NOEXPORT malloc_zone_t *default_zone = &virtual_default_zone.malloc_zone;
MALLOC_NOEXPORT
/*static*/ boolean_t
@@ -982,9 +1120,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
@@ -1072,6 +1210,13 @@
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)
{
@@ -1211,9 +1356,11 @@
{
phys_ncpus = *(uint8_t *)(uintptr_t)_COMM_PAGE_PHYSICAL_CPUS;
logical_ncpus = *(uint8_t *)(uintptr_t)_COMM_PAGE_LOGICAL_CPUS;
-#if CONFIG_MAGAZINE_PER_CLUSTER
- ncpuclusters = *(uint8_t *)(uintptr_t)_COMM_PAGE_CPU_CLUSTERS;
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
+#if CONFIG_CLUSTER_AWARE
+ {
+ ncpuclusters = *(uint8_t *)(uintptr_t)_COMM_PAGE_CPU_CLUSTERS;
+ }
+#endif // CONFIG_CLUSTER_AWARE
if (0 != (logical_ncpus % phys_ncpus)) {
MALLOC_REPORT_FATAL_ERROR(logical_ncpus % phys_ncpus,
@@ -1250,58 +1397,82 @@
max_medium_magazines = max_magazines;
}
-#if CONFIG_MAGAZINE_PER_CLUSTER && CONFIG_FEATUREFLAGS_SIMPLE
+ // 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 (ncpuclusters == 1) {
+#if CONFIG_FEATUREFLAGS_SIMPLE
// Not with the other feature flag checks because ncpuclusters needs to
// be initialized first
bool secure_allocator_single_cluster = os_feature_enabled_simple(
libmalloc, SecureAllocator_SingleCluster, false);
+#else // CONFIG_FEATUREFLAGS_SIMPLE
+ bool secure_allocator_single_cluster = false;
+#endif // CONFIG_FEATUREFLAGS_SIMPLE
if (malloc_xzone_enabled && !secure_allocator_single_cluster) {
malloc_xzone_enabled = false;
}
}
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
+#endif
_malloc_detect_interposition();
- set_flags_from_environment(); // will only set flags up to two times
+
+ set_flags_from_environment();
+
+ 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();
-
- // Force magazine_malloc when:
+
+#if CONFIG_NANOZONE
+ // Disable nano when:
// - sanitizer is enabled, to avoid speculative out-of-bounds
// use-after-free reads that nano/nanov2 performs, OR
// - MallocScribble is enabled, which nanov2 does not implement
// - MallocCheckZeroOnFreeCorruption sampling is enabled, which nanov2 does
// not implement
- // - xzone malloc is enabled
- if (!malloc_xzone_enabled &&
- !malloc_sanitizer_enabled &&
+ if (!malloc_sanitizer_enabled &&
!(malloc_debug_flags & MALLOC_DO_SCRIBBLE) &&
!malloc_zero_on_free_sample_period) {
nano_common_init(envp, apple, bootargs);
}
+#else // CONFIG_NANOZONE
+ (void)envp;
#endif // CONFIG_NANOZONE
-
- 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);
+ 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 CONFIG_NANOZONE
nano_common_configure();
- malloc_zone_t *helper_zone = initial_scalable_zone;
+ malloc_zone_t *helper_zone = initial_xzone_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);
}
@@ -1327,15 +1498,45 @@
initial_num_zones = malloc_num_zones;
-#if CONFIG_DEFERRED_RECLAIM
+#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
+ mach_vm_reclaim_error_t vmdr_kr = VM_RECLAIM_SUCCESS;
if (large_cache_enabled) {
- kern_return_t kr = mvm_deferred_reclaim_init();
- if (kr != KERN_SUCCESS) {
+ const bool xzone_deferred_reclaim =
+ CONFIG_XZM_DEFERRED_RECLAIM && initial_xzone_zone;
+ if (xzone_deferred_reclaim) {
+ // xzone_malloc will own the deferred_reclaim buffer
large_cache_enabled = false;
- malloc_report(ASL_LEVEL_ERR, "Unable to set up reclaim buffer (%d) - disabling large cache\n", kr);
- }
- }
-#endif /* CONFIG_DEFERRED_RECLAIM */
+ } else {
+ vmdr_kr = mvm_deferred_reclaim_init();
+ if (vmdr_kr != VM_RECLAIM_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));
+ }
+ }
+ }
+#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);
+ }
#if CONFIG_MEDIUM_ALLOCATOR
uint64_t memsize = platform_hw_memsize();
@@ -1356,17 +1557,20 @@
}
static bool
-enable_pgm(void)
+enable_pgm(unsigned flags)
{
bool other_debug_tool = has_injected_zone0 || malloc_sanitizer_enabled;
- return !other_debug_tool && pgm_should_enable();
+ // 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();
}
static void
register_pgm_zone(bool internal_diagnostics)
{
pgm_init_config(internal_diagnostics);
- if (enable_pgm()) {
+ if (enable_pgm(0)) {
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);
@@ -1430,10 +1634,16 @@
malloc_engaged_nano(void)
{
#if CONFIG_NANOZONE
- return _malloc_engaged_nano;
+ return (initial_nano_zone || initial_xzone_zone) ? _malloc_engaged_nano : 0;
#else
return 0;
#endif
+}
+
+int
+malloc_engaged_secure_allocator(void)
+{
+ return !!initial_xzone_zone;
}
static void
@@ -1536,6 +1746,9 @@
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 */
@@ -1601,8 +1814,12 @@
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 number of logical CPU clusters (%d)\n", max_magazines);
+ {
+ max_magazines = ncpuclusters;
+ malloc_report(ASL_LEVEL_INFO,
+ "Maximum magazines limited to ncpuclusters (%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");
@@ -1800,15 +2017,44 @@
}
flag = getenv("MallocSecureAllocator");
+ 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)) {
+ 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");
+ }
+ }
+
+ flag = getenv("MallocSecureAllocatorNano");
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_nano_override = value ? MALLOC_XZONE_OVERRIDE_ENABLED :
+ MALLOC_XZONE_OVERRIDE_DISABLED;
} else {
- malloc_report(ASL_LEVEL_ERR, "MallocSecureAllocator must be 0 or 1.\n");
- }
- }
+ 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,
@@ -1836,25 +2082,32 @@
}
}
+
malloc_zone_t *
malloc_create_zone(vm_size_t start_size, unsigned flags)
{
- malloc_zone_t *zone;
+ malloc_zone_t *zone = NULL;
/* start_size doesn't actually appear to be used, but we test anyway. */
if (start_size > malloc_absolute_max_size) {
return NULL;
}
- zone = create_scalable_zone(start_size, flags | malloc_debug_flags);
+
+ 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;
+ }
+
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;
}
@@ -1987,6 +2240,16 @@
malloc_zone_options_t mzo)
{
uint64_t type_id = malloc_get_tsd_type_id();
+#if MALLOC_TARGET_64BIT
+ bool clear_type = false;
+ if (!type_id) {
+ malloc_type_descriptor_t fallback =
+ malloc_callsite_fallback_type_descriptor();
+ malloc_set_tsd_type_descriptor(fallback);
+ type_id = fallback.type_id;
+ clear_type = true;
+ }
+#endif // MALLOC_TARGET_64BIT
MALLOC_TRACE(TRACE_malloc | DBG_FUNC_START, (uintptr_t)zone, size, type_id,
0);
@@ -2014,13 +2277,18 @@
MALLOC_TRACE(TRACE_malloc | DBG_FUNC_END, (uintptr_t)zone, size,
(uintptr_t)ptr, type_id);
out:
+#if MALLOC_TARGET_64BIT
+ if (clear_type) {
+ malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
+ }
+#endif // MALLOC_TARGET_64BIT
if (os_unlikely(ptr == NULL)) {
malloc_set_errno_fast(mzo, ENOMEM);
}
return ptr;
}
-static void *
+void *
_malloc_zone_malloc(malloc_zone_t *zone, size_t size, malloc_zone_options_t mzo)
{
if (zone == default_zone && !lite_zone) {
@@ -2038,6 +2306,11 @@
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);
}
@@ -2055,6 +2328,16 @@
size_t num_items, size_t size, malloc_zone_options_t mzo)
{
uint64_t type_id = malloc_get_tsd_type_id();
+#if MALLOC_TARGET_64BIT
+ bool clear_type = false;
+ if (!type_id) {
+ malloc_type_descriptor_t fallback =
+ malloc_callsite_fallback_type_descriptor();
+ malloc_set_tsd_type_descriptor(fallback);
+ type_id = fallback.type_id;
+ clear_type = true;
+ }
+#endif // MALLOC_TARGET_64BIT
MALLOC_TRACE(TRACE_calloc | DBG_FUNC_START, (uintptr_t)zone, num_items,
size, type_id);
@@ -2080,6 +2363,11 @@
MALLOC_TRACE(TRACE_calloc | DBG_FUNC_END, (uintptr_t)zone, num_items, size,
(uintptr_t)ptr);
+#if MALLOC_TARGET_64BIT
+ if (clear_type) {
+ malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
+ }
+#endif // MALLOC_TARGET_64BIT
if (os_unlikely(ptr == NULL)) {
malloc_set_errno_fast(mzo, ENOMEM);
}
@@ -2087,7 +2375,7 @@
}
MALLOC_NOINLINE
-static void *
+void *
_malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size,
malloc_zone_options_t mzo)
{
@@ -2101,6 +2389,11 @@
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);
}
@@ -2113,10 +2406,20 @@
}
MALLOC_NOINLINE
-static void *
+void *
_malloc_zone_valloc(malloc_zone_t *zone, size_t size, malloc_zone_options_t mzo)
{
uint64_t type_id = malloc_get_tsd_type_id();
+#if MALLOC_TARGET_64BIT
+ bool clear_type = false;
+ if (!type_id) {
+ malloc_type_descriptor_t fallback =
+ malloc_callsite_fallback_type_descriptor();
+ malloc_set_tsd_type_descriptor(fallback);
+ type_id = fallback.type_id;
+ clear_type = true;
+ }
+#endif // MALLOC_TARGET_64BIT
MALLOC_TRACE(TRACE_valloc | DBG_FUNC_START, (uintptr_t)zone, size, type_id,
0);
@@ -2143,6 +2446,12 @@
MALLOC_TRACE(TRACE_valloc | DBG_FUNC_END, (uintptr_t)zone, size,
(uintptr_t)ptr, type_id);
out:
+#if MALLOC_TARGET_64BIT
+ if (clear_type) {
+ malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
+ }
+#endif // MALLOC_TARGET_64BIT
+
if (os_unlikely(ptr == NULL)) {
malloc_set_errno_fast(mzo, ENOMEM);
}
@@ -2158,19 +2467,32 @@
// We have this function so code within libmalloc can call it without going
// through the (potentially interposed) dyld symbol stub
-static void *
-_malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size)
+void *
+_malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size,
+ malloc_type_descriptor_t type_desc)
{
uint64_t type_id = malloc_get_tsd_type_id();
+#if MALLOC_TARGET_64BIT
+ bool clear_type = false;
+ if (!type_id) {
+ // A type descriptor in the TSD takes precendence over one passed as a
+ // parameter - the one in the TSD will be a real one set by e.g.
+ // _malloc_type_realloc_outlined(), whereas the parameter will be a
+ // callsite-derived fallback
+ malloc_set_tsd_type_descriptor(type_desc);
+ type_id = type_desc.type_id;
+ clear_type = true;
+ }
+#endif // MALLOC_TARGET_64BIT
MALLOC_TRACE(TRACE_realloc | DBG_FUNC_START, (uintptr_t)zone,
(uintptr_t)ptr, size, type_id);
- void *new_ptr;
+ void *new_ptr = NULL;
if (malloc_check_start) {
internal_check();
}
if (size > malloc_absolute_max_size) {
- return NULL;
+ goto out;
}
new_ptr = zone->realloc(zone, ptr, size);
@@ -2190,6 +2512,12 @@
MALLOC_TRACE(TRACE_realloc | DBG_FUNC_END, (uintptr_t)zone, (uintptr_t)ptr,
size, (uintptr_t)new_ptr);
+out:
+#if MALLOC_TARGET_64BIT
+ if (clear_type) {
+ malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
+ }
+#endif // MALLOC_TARGET_64BIT
return new_ptr;
}
@@ -2197,7 +2525,8 @@
void *
malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size)
{
- return _malloc_zone_realloc(zone, ptr, size);
+ return _malloc_zone_realloc(zone, ptr, size,
+ malloc_callsite_fallback_type_descriptor());
}
MALLOC_NOINLINE
@@ -2244,16 +2573,28 @@
if (!ptr) {
return NULL;
} else {
- return find_registered_zone(ptr, NULL, false);
+ return _find_registered_zone(ptr, NULL, false);
}
}
MALLOC_NOINLINE
-static void *
+void *
_malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size,
- malloc_zone_options_t mzo)
+ malloc_zone_options_t mzo, malloc_type_descriptor_t type_desc)
{
uint64_t type_id = malloc_get_tsd_type_id();
+#if MALLOC_TARGET_64BIT
+ bool clear_type = false;
+ if (!type_id) {
+ // A type descriptor in the TSD takes precendence over one passed as a
+ // parameter - the one in the TSD will be a real one set by e.g.
+ // _malloc_type_aligned_alloc_outlined(), whereas the parameter will
+ // usually be a callsite-derived fallback
+ malloc_set_tsd_type_descriptor(type_desc);
+ type_id = type_desc.type_id;
+ clear_type = true;
+ }
+#endif // MALLOC_TARGET_64BIT
MALLOC_TRACE(TRACE_memalign | DBG_FUNC_START, (uintptr_t)zone, alignment,
size, type_id);
@@ -2276,7 +2617,8 @@
err = EINVAL;
goto out;
}
- // C11 requires size to be a multiple of alignment
+ // C11 aligned_alloc requires size to be a multiple of alignment, but
+ // posix_memalign does not
if ((mzo & MZ_C11) && (size & (alignment - 1)) != 0) {
err = EINVAL;
goto out;
@@ -2301,6 +2643,12 @@
size, (uintptr_t)ptr);
out:
+#if MALLOC_TARGET_64BIT
+ if (clear_type) {
+ malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
+ }
+#endif // MALLOC_TARGET_64BIT
+
if (os_unlikely(ptr == NULL)) {
if (mzo & MZ_POSIX) {
malloc_set_errno_fast(mzo, err);
@@ -2313,7 +2661,8 @@
void *
malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size)
{
- return _malloc_zone_memalign(zone, alignment, size, MZ_NONE);
+ return _malloc_zone_memalign(zone, alignment, size, MZ_NONE,
+ malloc_callsite_fallback_type_descriptor());
}
boolean_t
@@ -2403,11 +2752,12 @@
malloc_set_zone_name(malloc_zone_t *z, const char *name)
{
// TODO: save and restore permissions generally
- if (z != initial_xzone_zone) {
+ bool mprotect_zone = true;
+ if (mprotect_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);
}
@@ -2420,12 +2770,34 @@
} else {
char *name_copy = _malloc_zone_malloc(z, buflen, MZ_NONE);
if (name_copy) {
- strlcpy(name_copy, name, buflen);
+ strcpy(name_copy, name);
z->zone_name = name_copy;
}
}
- }
- if (z != initial_xzone_zone) {
+
+ malloc_zone_t *wrapped_zone = get_wrapped_zone(z);
+ if (wrapped_zone) {
+ // <name>-<wrapper_label>-<suffix>\0 // Wrapped zone name format
+ // ^ ^ ^ // 2 dashes and \0 -> +3
+ const char *wrapper_label = get_wrapper_zone_label(z);
+ const char *suffix = "Wrapped";
+ size_t buflen = strlen(name) + strlen(wrapper_label) + strlen(suffix) + 3;
+ char *wz_name = _malloc_zone_malloc(wrapped_zone, buflen, MZ_NONE);
+ if (wz_name) {
+ // snprintf() may allocate (not safe to use from libmalloc) and
+ // _simple_sprintf()/_simple_salloc() call vm_allocate() which is
+ // undesirable for such a simple API as malloc_set_zone_name()
+ strcpy(wz_name, name);
+ strcat(wz_name, "-");
+ strcat(wz_name, wrapper_label);
+ strcat(wz_name, "-");
+ strcat(wz_name, suffix);
+ malloc_set_zone_name(wrapped_zone, wz_name);
+ malloc_zone_free(wrapped_zone, wz_name);
+ }
+ }
+ }
+ if (mprotect_zone) {
mprotect(z, sizeof(malloc_zone_t), PROT_READ);
}
}
@@ -2445,14 +2817,13 @@
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(flags,
- "*** error for object %p: pointer being freed was not allocated\n", ptr);
+ malloc_report_pointer_was_not_allocated(flags, ptr);
} else if (zone->version >= 6 && zone->free_definite_size) {
malloc_zone_free_definite_size(zone, ptr, size);
} else {
@@ -2475,7 +2846,7 @@
aligned_alloc(size_t alignment, size_t size)
{
return _malloc_zone_memalign(default_zone, alignment, size,
- MZ_POSIX | MZ_C11);
+ MZ_POSIX | MZ_C11, malloc_callsite_fallback_type_descriptor());
}
MALLOC_NOINLINE
@@ -2485,9 +2856,10 @@
return _malloc_zone_calloc(default_zone, num_items, size, MZ_POSIX);
}
-MALLOC_NOINLINE
+// We have this function so code within libmalloc can call it without going
+// through the (potentially interposed) dyld symbol stub
void
-free(void *ptr)
+_free(void *ptr)
{
if (!ptr) {
return;
@@ -2501,7 +2873,6 @@
return;
}
-
if (zone0->try_free_default) {
zone0->try_free_default(zone0, ptr);
} else {
@@ -2509,13 +2880,19 @@
}
}
+MALLOC_NOINLINE
+void
+free(void *ptr)
+{
+ return _free(ptr);
+}
+
// We have this function so code within libmalloc can call it without going
// through the (potentially interposed) dyld symbol stub
-static void *
+void *
_realloc(void *in_ptr, size_t new_size)
{
void *retval = NULL;
- void *old_ptr;
malloc_zone_t *zone;
// SUSv3: "If size is 0 and ptr is not a null pointer, the object
@@ -2526,26 +2903,42 @@
// malloc_zone_malloc with zero size, which matches "If ptr is a null
// pointer, realloc() shall be equivalent to malloc() for the specified
// size." So we only free the original memory if the allocation succeeds.
- old_ptr = (new_size == 0) ? NULL : in_ptr;
- if (!old_ptr) {
+ //
+ // When in_ptr is NULL, we want to ensure that the fallback type descriptor
+ // is good. We can ensure that by tail-calling from here, so that the
+ // callsite information is accurate.
+ //
+ // 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(old_ptr, NULL, false);
+ zone = _find_registered_zone(in_ptr, NULL, false);
if (!zone) {
int flags = MALLOC_REPORT_DEBUG | MALLOC_REPORT_NOLOG;
- if (malloc_debug_flags & (MALLOC_ABORT_ON_CORRUPTION | MALLOC_ABORT_ON_ERROR)) {
+ 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(flags, "*** error for object %p: pointer being realloc'd was not allocated\n", in_ptr);
+ malloc_report_pointer_was_not_allocated(flags, in_ptr);
} else {
- retval = _malloc_zone_realloc(zone, old_ptr, new_size);
+ retval = _malloc_zone_realloc(zone, in_ptr, new_size,
+ malloc_callsite_fallback_type_descriptor());
}
}
if (retval == NULL) {
malloc_set_errno_fast(MZ_POSIX, ENOMEM);
} else if (new_size == 0) {
- free(in_ptr);
+ _free(in_ptr);
}
return retval;
}
@@ -2559,6 +2952,24 @@
MALLOC_NOINLINE
void *
+reallocf(void *in_ptr, size_t new_size)
+{
+ 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;
+}
+
+MALLOC_NOINLINE
+void *
valloc(size_t size)
{
return _malloc_zone_valloc(default_zone, size, MZ_POSIX);
@@ -2567,7 +2978,7 @@
extern void
vfree(void *ptr)
{
- free(ptr);
+ _free(ptr);
}
size_t
@@ -2579,7 +2990,7 @@
return size;
}
- (void)find_registered_zone(ptr, &size, false);
+ (void)_find_registered_zone(ptr, &size, false);
return size;
}
@@ -2608,14 +3019,15 @@
// We have this function so code within libmalloc can call it without going
// through the (potentially interposed) dyld symbol stub
-static int
+int
_posix_memalign(void **memptr, size_t alignment, size_t size)
{
void *retval;
/* POSIX is silent on NULL == memptr !?! */
- retval = _malloc_zone_memalign(default_zone, alignment, size, MZ_NONE);
+ retval = _malloc_zone_memalign(default_zone, alignment, size, MZ_NONE,
+ malloc_callsite_fallback_type_descriptor());
if (retval == NULL) {
// To avoid testing the alignment constraints redundantly, we'll rely on the
// test made in malloc_zone_memalign to vet each request. Only if that test fails
@@ -2700,446 +3112,118 @@
return reallocf(in_ptr, alloc_size);
}
-/********* malloc_type ************/
+void *
+_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;
+
+ if (zone == NULL || zone == default_zone) {
+ zone = runtime_default_zone();
+ }
#if MALLOC_TARGET_64BIT
-
-MALLOC_ALWAYS_INLINE MALLOC_INLINE
-static malloc_type_descriptor_t
-_malloc_type_outlined_set_tsd(malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = malloc_get_tsd_type_descriptor();
-
+ uint64_t type_id = malloc_get_tsd_type_id();
+ bool clear_type = false;
if (!type_id) {
- // We need this to be non-zero so that we can use it for the recursion
- // check below
- type_id = MALLOC_TYPE_ID_NONZERO;
- }
- malloc_set_tsd_type_descriptor(
- (malloc_type_descriptor_t){ .type_id = type_id });
-
- return prev_type_desc;
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_type_malloc_outlined(size_t size, malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- ptr = malloc(size);
+ malloc_type_descriptor_t fallback =
+ malloc_callsite_fallback_type_descriptor();
+ malloc_set_tsd_type_descriptor(fallback);
+ type_id = fallback.type_id;
+ clear_type = true;
+ }
+#endif // MALLOC_TARGET_64BIT
+
+ if (malloc_interposition_compat || (zone->version < 15) ||
+ !zone->malloc_with_options) {
+ // 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)) {
+ memset(ptr, 0, size);
+ }
+ } else if (options & MALLOC_NP_OPTION_CLEAR) {
+ ptr = malloc_zone_calloc(zone, 1, size);
+ } else {
+ ptr = malloc_zone_malloc(zone, size);
+ }
+
} else {
- ptr = _malloc_zone_malloc(default_zone, size, MZ_POSIX);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
+ MALLOC_TRACE(TRACE_malloc_options | DBG_FUNC_START, (uintptr_t)zone,
+ align, size, 0);
+ ptr = zone->malloc_with_options(zone, align, size, options);
+
+ if (os_unlikely(malloc_logger)) {
+ uint32_t flags = MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE;
+ if (options & MALLOC_NP_OPTION_CLEAR) {
+ flags |= MALLOC_LOG_TYPE_CLEARED;
+ }
+ malloc_logger(flags, (uintptr_t)zone, (uintptr_t)size,
+ 0, (uintptr_t)ptr, 0);
+ }
+ if (os_unlikely(malloc_simple_stack_logging)) {
+ malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS,
+ "malloc_with_options (%p/%llu,%llu): ", ptr,
+ (unsigned long long)align, (unsigned long long)size);
+ }
+ MALLOC_TRACE(TRACE_malloc_options | DBG_FUNC_END,
+ (uintptr_t)zone, align, size, (uintptr_t)ptr);
+ }
+
+#if MALLOC_TARGET_64BIT
+ if (clear_type) {
+ malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
+ }
+#endif
+
return ptr;
}
-MALLOC_NOINLINE
-static void *
-_malloc_type_calloc_outlined(size_t count, size_t size, malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- ptr = calloc(count, size);
- } else {
- ptr = _malloc_zone_calloc(default_zone, count, size, MZ_POSIX);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return ptr;
-}
-
-// TODO: malloc_type_free_outlined
-
-MALLOC_NOINLINE
-static void *
-_malloc_type_realloc_outlined(void *ptr, size_t size, malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *new_ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- new_ptr = realloc(ptr, size);
- } else {
- new_ptr = _realloc(ptr, size);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return new_ptr;
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_type_aligned_alloc_outlined(size_t alignment, size_t size,
- malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- ptr = aligned_alloc(alignment, size);
- } else {
- ptr = _malloc_zone_memalign(default_zone, alignment, size,
- MZ_POSIX | MZ_C11);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return ptr;
-}
-
-MALLOC_NOINLINE
-static int
-_malloc_type_posix_memalign_outlined(void **memptr, size_t alignment,
- size_t size, malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- int retval;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- retval = posix_memalign(memptr, alignment, size);
- } else {
- retval = _posix_memalign(memptr, alignment, size);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return retval;
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_type_zone_malloc_outlined(malloc_zone_t *zone, size_t size,
- malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- ptr = malloc_zone_malloc(zone, size);
- } else {
- ptr = _malloc_zone_malloc(zone, size, MZ_NONE);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return ptr;
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_type_zone_calloc_outlined(malloc_zone_t *zone, size_t count, size_t size,
- malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- ptr = malloc_zone_calloc(zone, count, size);
- } else {
- ptr = _malloc_zone_calloc(zone, count, size, MZ_NONE);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return ptr;
-}
-
-// TODO: malloc_type_zone_free_outlined
-
-MALLOC_NOINLINE
-static void *
-_malloc_type_zone_realloc_outlined(malloc_zone_t *zone, void *ptr, size_t size,
- malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *new_ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- new_ptr = malloc_zone_realloc(zone, ptr, size);
- } else {
- new_ptr = _malloc_zone_realloc(zone, ptr, size);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return new_ptr;
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_type_zone_memalign_outlined(malloc_zone_t *zone, size_t alignment,
- size_t size, malloc_type_id_t type_id)
-{
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- ptr = malloc_zone_memalign(zone, alignment, size);
- } else {
- ptr = _malloc_zone_memalign(zone, alignment, size, MZ_NONE);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return ptr;
-}
-
void *
-malloc_type_malloc(size_t size, malloc_type_id_t type_id)
-{
- if (os_unlikely(size > malloc_absolute_max_size)) {
- malloc_set_errno_fast(MZ_POSIX, ENOMEM);
+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_type_malloc_outlined(size, type_id);
- }
-
- malloc_zone_t *zone0 = malloc_zones[0];
-
-
- if (zone0->version >= 13) {
- return zone0->malloc(zone0, size);
- }
-
- return _malloc_type_malloc_outlined(size, type_id);
-}
-
-void *
-malloc_type_calloc(size_t count, size_t size, malloc_type_id_t type_id)
-{
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_type_calloc_outlined(count, size, type_id);
- }
-
- malloc_zone_t *zone0 = malloc_zones[0];
-
- if (zone0->version >= 13) {
- return zone0->calloc(zone0, count, size);
- }
-
- return _malloc_type_calloc_outlined(count, size, type_id);
-}
-
-void
-malloc_type_free(void *ptr, malloc_type_id_t type_id)
-{
- // TODO: this is not interposition-safe - need to revist when we want to
- // actually start using this
- return free(ptr);
-}
-
-void *
-malloc_type_realloc(void *ptr, size_t size, malloc_type_id_t type_id)
-{
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_type_realloc_outlined(ptr, size, type_id);
- }
-
- malloc_zone_t *zone0 = malloc_zones[0];
-
- // We're okay with dropping the type information here because
- // malloc_slowpath should cover most of the situations we'd want to preserve
- // it for. If we'd prefer to get more coverage we could go through
- // _malloc_type_realloc_outlined(), at the expense of doing the TSD
- // save/restore pointlessly sometimes.
- return _realloc(ptr, size);
-}
-
-void *
-malloc_type_valloc(size_t size, malloc_type_id_t type_id)
-{
- // valloc is not used often enough to warrant fastpath handling, so we'll
- // just always pass the type information via the TSD
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- ptr = valloc(size);
- } else {
- ptr = _malloc_zone_valloc(default_zone, size, MZ_POSIX);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return ptr;
-}
-
-void *
-malloc_type_aligned_alloc(size_t alignment, size_t size,
- malloc_type_id_t type_id)
-{
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_type_aligned_alloc_outlined(alignment, size, type_id);
- }
-
-
- // Everything else takes the slower path
- return _malloc_type_aligned_alloc_outlined(alignment, size, type_id);
-}
-
-int
-malloc_type_posix_memalign(void **memptr, size_t alignment, size_t size,
- malloc_type_id_t type_id)
-{
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_type_posix_memalign_outlined(memptr, alignment, size,
- type_id);
- }
-
-
- return _malloc_type_posix_memalign_outlined(memptr, alignment, size,
- type_id);
-}
-
-void *
-malloc_type_zone_malloc(malloc_zone_t *zone, size_t size,
- malloc_type_id_t type_id)
-{
- if (os_unlikely(size > malloc_absolute_max_size)) {
- malloc_set_errno_fast(MZ_POSIX, ENOMEM);
- return NULL;
- }
-
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_type_zone_malloc_outlined(zone, size, type_id);
- }
-
- if (zone == default_zone) {
+ return _malloc_zone_malloc_with_options_np_outlined(zone, align, size,
+ options);
+ }
+
+ if (zone == NULL || zone == default_zone) {
zone = malloc_zones[0];
}
-
- if (zone->version >= 13) {
- return zone->malloc(zone, size);
- }
-
- return _malloc_type_zone_malloc_outlined(zone, size, type_id);
-}
-
-void *
-malloc_type_zone_calloc(malloc_zone_t *zone, size_t count, size_t size,
- malloc_type_id_t type_id)
-{
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_type_zone_calloc_outlined(zone, count, size, type_id);
- }
-
- if (zone == default_zone) {
- zone = malloc_zones[0];
- }
-
-
- if (zone->version >= 13) {
- return zone->calloc(zone, count, size);
- }
-
- return _malloc_type_zone_calloc_outlined(zone, count, size, type_id);
-}
-
-void
-malloc_type_zone_free(malloc_zone_t *zone, void *ptr, malloc_type_id_t type_id)
-{
- // TODO: this is not interposition-safe - need to revist when we want to
- // actually start using this
- return malloc_zone_free(zone, ptr);
-}
-
-void *
-malloc_type_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size,
- malloc_type_id_t type_id)
-{
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_type_zone_realloc_outlined(zone, ptr, size, type_id);
- }
-
- if (zone == default_zone) {
- zone = malloc_zones[0];
- }
-
-
- // We're okay with dropping the type information here because
- // malloc_slowpath should cover most of the situations we'd want to preserve
- // it for. If we'd prefer to get more coverage we could go through
- // _malloc_type_zone_realloc_outlined(), at the expense of doing the TSD
- // save/restore pointlessly sometimes.
- return _malloc_zone_realloc(zone, ptr, size);
-}
-
-void *
-malloc_type_zone_valloc(malloc_zone_t *zone, size_t size,
- malloc_type_id_t type_id)
-{
- // valloc is not used often enough to warrant fastpath handling, so we'll
- // just always pass the type information via the TSD
- malloc_type_descriptor_t prev_type_desc = _malloc_type_outlined_set_tsd(
- type_id);
-
- void *ptr;
- if (malloc_interposition_compat && !prev_type_desc.type_id) {
- // We're (potentially) interposed at the symbol level and aren't in a
- // recursive call, so call through the external symbol
- ptr = malloc_zone_valloc(zone, size);
- } else {
- ptr = _malloc_zone_valloc(zone, size, MZ_NONE);
- }
-
- malloc_set_tsd_type_descriptor(prev_type_desc);
- return ptr;
-}
-
-void *
-malloc_type_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size,
- malloc_type_id_t type_id)
-{
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_type_zone_memalign_outlined(zone, alignment, size,
- type_id);
- }
-
-
- // Everything else takes the slower path
- return _malloc_type_zone_memalign_outlined(zone, alignment, size, type_id);
-}
-
-#endif // MALLOC_TARGET_64BIT
+ 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);
+}
/********* Purgeable zone ************/
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.
@@ -3184,7 +3268,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. */
@@ -3245,11 +3329,11 @@
void
malloc_memory_event_handler(unsigned long event)
{
-#if CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM)
+#if CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_MAGAZINE_DEFERRED_RECLAIM)
if (event & MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF) {
malloc_zone_pressure_relief(0, 0);
}
-#endif /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM) */
+#endif /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_MAGAZINE_DEFERRED_RECLAIM) */
if ((event & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 && (event & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0) {
malloc_register_stack_logger();
@@ -3450,9 +3534,8 @@
vm_address_t *zones_address_ref;
unsigned num_zones;
unsigned *num_zones_ref;
- if (!reader) {
- reader = _malloc_default_reader;
- }
+ reader = reader_or_in_memory_fallback(reader, task);
+
// printf("Read malloc_zones at address %p should be %p\n", &malloc_zones, malloc_zones);
err = reader(task, remote_malloc_zones, sizeof(void *), (void **)&zones_address_ref);
// printf("Read malloc_zones[%p]=%p\n", remote_malloc_zones, *zones_address_ref);
@@ -3611,6 +3694,14 @@
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();
}
@@ -3619,6 +3710,11 @@
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();
@@ -3636,6 +3732,11 @@
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();
@@ -3677,7 +3778,7 @@
{
#if CONFIG_NANOZONE
if (_malloc_entropy_initialized) {
- if (_malloc_engaged_nano == NANO_V2) {
+ if (initial_nano_zone) {
nanov2_forked_zone((nanozonev2_t *)initial_nano_zone);
}
}
@@ -3782,6 +3883,22 @@
malloc_zero_policy = MALLOC_ZERO_NONE;
}
+bool
+malloc_variant_is_debug_4test(void)
+{
+#ifdef DEBUG
+ return true;
+#else
+ return false;
+#endif
+}
+
+bool
+malloc_allows_internal_security_4test(void)
+{
+ return malloc_internal_security_policy;
+}
+
/***************** OBSOLETE ENTRY POINTS ********************/
#ifndef PHASE_OUT_OLD_MALLOC
@@ -3824,13 +3941,6 @@
#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)
{
@@ -3841,6 +3951,12 @@
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;
@@ -3849,8 +3965,7 @@
pgm_thread_set_disabled(opts.DisableProbabilisticGuardMalloc);
- th_opts_t x = {.options = opts};
- _pthread_setspecific_direct(__TSD_MALLOC_THREAD_OPTIONS, x.storage);
+ _malloc_set_thread_options(opts);
}
#pragma mark -
@@ -3874,7 +3989,8 @@
if (0==strncmp(*e, "MallocStackLogging", 18)) {
_malloc_register_stack_logger(true);
if (msl.set_flags_from_environment) {
- msl.set_flags_from_environment(env);
+ // rdar://125495815 - re-fetch env, as it may have moved
+ msl.set_flags_from_environment((const char **)*_NSGetEnviron());
}
break;
}
@@ -3896,7 +4012,6 @@
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");
@@ -3907,13 +4022,6 @@
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) {
@@ -3990,227 +4098,6 @@
}
}
-//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;