Loading...
--- libmalloc/libmalloc-792.1.1/private/malloc_private.h
+++ libmalloc/libmalloc-474.0.13/private/malloc_private.h
@@ -26,28 +26,26 @@
/* Here be dragons (SPIs) */
-#include <TargetConditionals.h>
-#include <malloc/_platform.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/mach_types.h>
+#include <sys/cdefs.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
#include <Availability.h>
#include <os/availability.h>
-#include <os/base.h>
#include <malloc/malloc.h>
-
-#include <malloc/_ptrcheck.h>
-__ptrcheck_abi_assume_single()
__BEGIN_DECLS
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
/* Memorypressure notification mask to use by default */
-extern unsigned long malloc_memorypressure_mask_default_4libdispatch;
+extern const unsigned long malloc_memorypressure_mask_default_4libdispatch;
/* Memorypressure notification mask to use if MSL has been enabled */
-extern unsigned long malloc_memorypressure_mask_msl_4libdispatch;
-#endif // !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
+extern const unsigned long malloc_memorypressure_mask_msl_4libdispatch;
/********* Callbacks ************/
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
API_AVAILABLE(macos(10.12), ios(10.0), tvos(10.0), watchos(3.0))
void malloc_enter_process_memory_limit_warn_mode(void);
/* A callback invoked once the process receives a warning for approaching
@@ -58,17 +56,12 @@
void malloc_memory_event_handler(unsigned long);
/* A function invoked when malloc needs to handle any flavor of
* memory pressure notification or process memory limit notification. */
-#endif // !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
API_AVAILABLE(macos(10.12), ios(10.0), tvos(10.0), watchos(3.0))
-void * __sized_by_or_null(nmemb * size) reallocarray(void * in_ptr,
- size_t nmemb, size_t size) __DARWIN_EXTSN(reallocarray)
- __result_use_check;
+void * reallocarray(void * in_ptr, size_t nmemb, size_t size) __DARWIN_EXTSN(reallocarray) __result_use_check;
API_AVAILABLE(macos(10.12), ios(10.0), tvos(10.0), watchos(3.0))
-void * __sized_by_or_null(nmemb * size) reallocarrayf(void * in_ptr,
- size_t nmemb, size_t size) __DARWIN_EXTSN(reallocarrayf)
- __result_use_check;
+void * reallocarrayf(void * in_ptr, size_t nmemb, size_t size) __DARWIN_EXTSN(reallocarrayf) __result_use_check;
/*
* Checks whether an address might belong to any registered zone. False positives
@@ -86,28 +79,14 @@
* allowed.
*/
API_AVAILABLE(macos(10.14), ios(12.0), tvos(12.0), watchos(5.0))
-boolean_t malloc_zone_claimed_address(malloc_zone_t *zone, void *ptr)
- __result_use_check;
+boolean_t malloc_zone_claimed_address(malloc_zone_t *zone, void *ptr) __result_use_check;
/**
- * Returns whether the nano allocator (or a roughly equivalent configuration of
- * another system allocator implementation) is engaged. The return value is 0 if
- * Nano is not engaged and the allocator version otherwise.
+ * Returns whether the nano allocator is engaged. The return value is 0 if Nano
+ * is not engaged and the allocator version otherwise.
*/
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
API_AVAILABLE(macos(10.14), ios(12.0), tvos(12.0), watchos(5.0))
int malloc_engaged_nano(void) __result_use_check;
-#endif // !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
-
-/**
- * Returns whether the secure allocator is engaged. The return value is 0 if it
- * is not engaged and the allocator version otherwise.
- */
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
-SPI_AVAILABLE(macos(14.3), ios(17.4), tvos(17.4), watchos(10.4),
- driverkit(23.4), visionos(1.1))
-int malloc_engaged_secure_allocator(void) __result_use_check;
-#endif
/*
* Disables zero-on-free in a process. This has security implications and is
@@ -119,20 +98,6 @@
SPI_AVAILABLE(macos(13.0), ios(16.1), tvos(16.1), watchos(9.1))
void malloc_zero_on_free_disable(void);
-/*
- * Certain zone types (e.g., PGM, sanitizer) wrap other zones to add extra
- * behavior and delegate most of the actual work to the wrapped zone. Retrieves
- * the address of the wrapped zone or NULL for zone types that don't wrap
- * another zone.
- */
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
-SPI_AVAILABLE(macos(14.3), ios(17.4), tvos(17.4), watchos(10.4))
-kern_return_t malloc_get_wrapped_zone(task_t task,
- memory_reader_t reader,
- vm_address_t zone_address,
- vm_address_t *wrapped_zone_address) __result_use_check;
-#endif // !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
-
/****** Thread-specific libmalloc options ******/
/**
@@ -142,16 +107,13 @@
uintptr_t DisableExpensiveDebuggingOptions : 1;
uintptr_t DisableProbabilisticGuardMalloc : 1;
uintptr_t DisableMallocStackLogging : 1;
- uintptr_t ReservedFlag : 1;
} malloc_thread_options_t;
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
API_AVAILABLE(macos(13.0), ios(16.0), tvos(16.0), watchos(9.0))
malloc_thread_options_t malloc_get_thread_options(void) __result_use_check;
API_AVAILABLE(macos(13.0), ios(16.0), tvos(16.0), watchos(9.0))
void malloc_set_thread_options(malloc_thread_options_t opts);
-#endif // !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
/****** Crash Reporter integration ******/
@@ -165,8 +127,7 @@
/**
* Like memory_reader_t, but caller must free returned memory if not NULL.
*/
-typedef void * __sized_by_or_null(size) (*crash_reporter_memory_reader_t)(
- task_t task, vm_address_t address, size_t size);
+typedef void *(*crash_reporter_memory_reader_t)(task_t task, vm_address_t address, size_t size);
/****** Probabilistic Guard Malloc ******/
@@ -185,12 +146,12 @@
stack_trace_t dealloc_trace;
} pgm_report_t;
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
-kern_return_t pgm_extract_report_from_corpse(vm_address_t fault_address,
- pgm_report_t *report, task_t task, vm_address_t *zone_addresses,
- uint32_t zone_count, crash_reporter_memory_reader_t crm_reader)
- __result_use_check;
-#endif // !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
+
+kern_return_t pgm_extract_report_from_corpse(vm_address_t fault_address, pgm_report_t *report, task_t task,
+ vm_address_t *zone_addresses, uint32_t zone_count, crash_reporter_memory_reader_t crm_reader) __result_use_check;
+
+kern_return_t pgm_diagnose_fault_from_crash_reporter(vm_address_t fault_address, pgm_report_t *report,
+ task_t task, vm_address_t zone_address, crash_reporter_memory_reader_t crm_reader) __result_use_check;
/****** Sanitizer Zone ******/
@@ -198,8 +159,7 @@
// ASAN_HEAP_LEFTRZ: [ptr, ptr + leftrz_sz)
// ASAN_VALID: [ptr + leftrz_sz, ptr + alloc_sz)
// ASAN_HEAP_RIGHTRZ: [ptr + leftrz_sz + alloc_sz, ptr + leftrz_sz + alloc_sz + rightrz_sz)
- void (*heap_allocate_poison)(uintptr_t ptr, size_t leftrz_sz,
- size_t alloc_sz, size_t rightrz_sz);
+ void (*heap_allocate_poison)(uintptr_t ptr, size_t leftrz_sz, size_t alloc_sz, size_t rightrz_sz);
// ASAN_HEAP_FREED: [ptr, ptr + sz)
void (*heap_deallocate_poison)(uintptr_t ptr, size_t sz);
// ASAN_HEAP_INTERNAL: [ptr, ptr + sz)
@@ -223,76 +183,8 @@
stack_trace_t dealloc_trace;
} sanitizer_report_t;
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
-kern_return_t sanitizer_diagnose_fault_from_crash_reporter(
- vm_address_t fault_address, sanitizer_report_t *report, task_t task,
- vm_address_t zone_address, crash_reporter_memory_reader_t crm_reader)
- __result_use_check;
-#endif // !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
-
-/****** Malloc with flags ******/
-
-typedef malloc_zone_malloc_options_t malloc_options_np_t;
-#define MALLOC_NP_OPTION_CLEAR MALLOC_ZONE_MALLOC_OPTION_CLEAR
-#define MALLOC_OPTIONS_NP_DEFAULT_ALIGN (sizeof(void *))
-
-
-#if defined(__LP64__) // MALLOC_TARGET_64BIT
-/*!
- * @function malloc_type_zone_malloc_with_options_internal
- *
- * @discussion
- * This function shouldn't be called directly, it is the deprecated rewrite
- * target for the corrected symbol with the type_id in the fourth argument.
- */
-SPI_DEPRECATED_WITH_REPLACEMENT("malloc_type_zone_malloc_with_options",
- macos(15.0,16.0), ios(18.0,19.0), tvos(18.0,19.0), watchos(11.0,12.0),
- driverkit(24.0,25.0), visionos(2.0,3.0))
-void * __sized_by_or_null(size) malloc_type_zone_malloc_with_options_internal(
- malloc_zone_t *zone, size_t align, size_t size,
- malloc_type_id_t desc, malloc_options_np_t options) __result_use_check
-#if defined(__has_attribute) && __has_attribute(diagnose_if)
-__attribute__((__diagnose_if__(align && (align & (align-1)),
- "alignment should be 0 or a power of 2", "error")))
-__attribute__((__diagnose_if__(align && (size % align),
- "size should be an integral multiple of align", "error")))
-#endif
- __alloc_size(3) __alloc_align(2);
-#endif // MALLOC_TARGET_64BIT
-
-/*!
- * @function malloc_zone_malloc_with_options_np
- *
- * @discussion
- * This function shouldn't be called directly, it is a deprecated SPI.
- */
-SPI_DEPRECATED_WITH_REPLACEMENT("malloc_zone_malloc_with_options",
- macos(14.3,16.0), ios(17.4,19.0), tvos(17.4,19.0), watchos(10.4,12.0),
- driverkit(23.4,25.0), visionos(1.1,3.0))
-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) __result_use_check
-#if defined(__has_attribute) && __has_attribute(diagnose_if)
-__attribute__((__diagnose_if__(align && (align & (align-1)),
- "alignment should be 0 or a power of 2", "error")))
-__attribute__((__diagnose_if__(align && (size % align),
- "size should be an integral multiple of align", "error")))
-#endif
- __alloc_size(3) __alloc_align(2)
- _MALLOC_TYPED(malloc_type_zone_malloc_with_options_internal, 3);
-
-#if !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT
-// Indicates whether the libmalloc debug dylib is in use in the current process
-SPI_AVAILABLE(macos(14.3), ios(17.4), tvos(17.4), watchos(10.4),
- driverkit(23.4), visionos(1.1))
-bool
-malloc_variant_is_debug_4test(void);
-
-// Indicates whether libmalloc internal security policy is enabled in the
-// current process
-bool
-malloc_allows_internal_security_4test(void);
-#endif /* !TARGET_OS_EXCLAVECORE && !TARGET_OS_EXCLAVEKIT */
+kern_return_t sanitizer_diagnose_fault_from_crash_reporter(vm_address_t fault_address, sanitizer_report_t *report,
+ task_t task, vm_address_t zone_address, crash_reporter_memory_reader_t crm_reader) __result_use_check;
__END_DECLS