Loading...
--- Libc/Libc-391/gen/malloc.c
+++ Libc/Libc-498/gen/malloc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2006, 2007 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -33,17 +33,34 @@
#import <crt_externs.h>
#import <errno.h>
#import <pthread_internals.h>
+#import <limits.h>
+#import <dlfcn.h>
#import "scalable_malloc.h"
#import "stack_logging.h"
+#import "malloc_printf.h"
+#import "_simple.h"
+
+/*
+ * MALLOC_ABSOLUTE_MAX_SIZE - There are many instances of addition to a
+ * user-specified size_t, which can cause overflow (and subsequent crashes)
+ * for values near SIZE_T_MAX. Rather than add extra "if" checks everywhere
+ * this occurs, it is easier to just set an absolute maximum request size,
+ * and immediately return an error if the requested size exceeds this maximum.
+ * Of course, values less than this absolute max can fail later if the value
+ * is still too large for the available memory. The largest value added
+ * seems to be PAGE_SIZE (in the macro round_page()), so to be safe, we set
+ * the maximum to be 2 * PAGE_SIZE less than SIZE_T_MAX.
+ */
+#define MALLOC_ABSOLUTE_MAX_SIZE (SIZE_T_MAX - (2 * PAGE_SIZE))
#define USE_SLEEP_RATHER_THAN_ABORT 0
#define INITIAL_ZONES 8 // After this number, we reallocate for new zones
-typedef void (malloc_logger_t)(unsigned type, unsigned arg1, unsigned arg2, unsigned arg3, unsigned result, unsigned num_hot_frames_to_skip);
-
-static pthread_lock_t _malloc_lock;
+typedef void (malloc_logger_t)(uint32_t type, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t result, uint32_t num_hot_frames_to_skip);
+
+__private_extern__ pthread_lock_t _malloc_lock = 0; // initialized in __libc_init
static malloc_zone_t *initial_malloc_zones[INITIAL_ZONES] = {0};
/* The following variables are exported for the benefit of performance tools */
@@ -57,12 +74,24 @@
unsigned malloc_check_counter = 0;
unsigned malloc_check_each = 1000;
+/* global flag to suppress ASL logging e.g. for syslogd */
+int _malloc_no_asl_log = 0;
+
static int malloc_check_sleep = 100; // default 100 second sleep
static int malloc_check_abort = 0; // default is to sleep, not abort
-static int malloc_free_abort = 0; // default is not to abort
-
-static int malloc_debug_file;
+static int malloc_debug_file = STDERR_FILENO;
+/*
+ * State indicated by malloc_def_zone_state
+ * 0 - the default zone has not yet been created
+ * 1 - a Malloc* environment variable has been set
+ * 2 - the default zone has been created and an environment variable scan done
+ * 3 - a new default zone has been created and another environment variable scan
+ */
+__private_extern__ int malloc_def_zone_state = 0;
+__private_extern__ malloc_zone_t *__zone0 = NULL;
+
+static const char Malloc_Facility[] = "com.apple.Libsystem.malloc";
#define MALLOC_LOCK() LOCK(_malloc_lock)
#define MALLOC_UNLOCK() UNLOCK(_malloc_lock)
@@ -77,41 +106,97 @@
static inline malloc_zone_t * find_registered_zone(const void *, size_t *) __attribute__((always_inline));
static inline malloc_zone_t *
find_registered_zone(const void *ptr, size_t *returned_size) {
- // locates the proper zone
- // if zone found fills returnedSize; else returns NULL
- // See comment in malloc_zone_register() about clients non locking to call this function
- // Speed is critical for this function
- unsigned index = malloc_num_zones;
+ // Returns a zone which may contain ptr, or NULL.
+ // Speed is critical for this function, so it is not guaranteed to return
+ // the zone which contains ptr. For N zones, zones 1 through N - 1 are
+ // checked to see if they contain ptr. If so, the zone containing ptr is
+ // returned. Otherwise the last zone is returned, since it is the last zone
+ // in which ptr may reside. Clients should call zone->size(ptr) on the
+ // return value to determine whether or not ptr is an allocated object.
+ // This behavior optimizes for the case where ptr is an allocated object,
+ // and there is only one zone.
+ unsigned index, limit = malloc_num_zones;
+ if (limit == 0)
+ return NULL;
+
malloc_zone_t **zones = malloc_zones;
- while (index--) {
- malloc_zone_t *zone = *zones++;
- size_t size;
- size = zone->size(zone, ptr);
+ for (index = 0; index < limit - 1; ++index, ++zones) {
+ malloc_zone_t *zone = *zones;
+ size_t size = zone->size(zone, ptr);
if (size) {
if (returned_size) *returned_size = size;
return zone;
}
}
- return NULL;
+ return malloc_zones[index];
+}
+
+__private_extern__ __attribute__((noinline)) void
+malloc_error_break(void) {
+ // Provides a non-inlined place for various malloc error procedures to call
+ // that will be called after an error message appears. It does not make
+ // sense for developers to call this function, so it is marked
+ // __private_extern__ to prevent it from becoming API.
}
/********* Creation and destruction ************/
+
+static void set_flags_from_environment(void);
+
+// malloc_zone_register_while_locked may drop the lock temporarily
+static void
+malloc_zone_register_while_locked(malloc_zone_t *zone) {
+ /* Note that given the sequencing it is always safe to first get the number of zones, then get malloc_zones without taking the lock, if all you need is to iterate through the list */
+ if (malloc_num_zones >= INITIAL_ZONES) {
+ malloc_zone_t **zones = malloc_zones;
+ malloc_zone_t *pzone = malloc_zones[0];
+ boolean_t copy = malloc_num_zones == INITIAL_ZONES;
+ if (copy) zones = NULL; // to avoid realloc on something not allocated
+ MALLOC_UNLOCK();
+ zones = pzone->realloc(pzone, zones, (malloc_num_zones + 1) * sizeof(malloc_zone_t *)); // we leak initial_malloc_zones, not worth tracking it
+ MALLOC_LOCK();
+ if (copy) memcpy(zones, malloc_zones, malloc_num_zones * sizeof(malloc_zone_t *));
+ malloc_zones = zones;
+ }
+ malloc_zones[malloc_num_zones] = zone;
+ malloc_num_zones++; // note that we do this after setting malloc_num_zones, so enumerations without taking the lock are safe
+ // _malloc_printf(ASL_LEVEL_INFO, "Registered %p malloc_zones at address %p is %p [%d zones]\n", zone, &malloc_zones, malloc_zones, malloc_num_zones);
+}
static void
_malloc_initialize(void) {
- // guaranteed to be called only once
- (void)malloc_create_zone(0, 0);
- malloc_set_zone_name(malloc_zones[0], "DefaultMallocZone");
- LOCK_INIT(_malloc_lock);
- // malloc_printf("%d registered zones\n", malloc_num_zones);
- // malloc_printf("malloc_zones is at %p; malloc_num_zones is at %p\n", (unsigned)&malloc_zones, (unsigned)&malloc_num_zones);
+ MALLOC_LOCK();
+ if (malloc_def_zone_state < 2) {
+ unsigned n;
+ malloc_zone_t *zone;
+
+ malloc_def_zone_state += 2;
+ set_flags_from_environment(); // will only set flags up to two times
+ n = malloc_num_zones;
+ zone = create_scalable_zone(0, malloc_debug_flags);
+ //malloc_zone_register_while_locked may drop the lock temporarily
+ malloc_zone_register_while_locked(zone);
+ malloc_set_zone_name(zone, "DefaultMallocZone");
+ if (n != 0) { // make the default first, for efficiency
+ malloc_zone_t *hold = malloc_zones[0];
+ if(hold->zone_name && strcmp(hold->zone_name, "DefaultMallocZone") == 0) {
+ free((void *)hold->zone_name);
+ hold->zone_name = NULL;
+ }
+ malloc_zones[0] = malloc_zones[n];
+ malloc_zones[n] = hold;
+ }
+ // _malloc_printf(ASL_LEVEL_INFO, "%d registered zones\n", malloc_num_zones);
+ // _malloc_printf(ASL_LEVEL_INFO, "malloc_zones is at %p; malloc_num_zones is at %p\n", (unsigned)&malloc_zones, (unsigned)&malloc_num_zones);
+ }
+ MALLOC_UNLOCK();
}
static inline malloc_zone_t *inline_malloc_default_zone(void) __attribute__((always_inline));
static inline malloc_zone_t *
inline_malloc_default_zone(void) {
- if (!malloc_num_zones) _malloc_initialize();
- // malloc_printf("In inline_malloc_default_zone with %d %d\n", malloc_num_zones, malloc_has_debug_zone);
+ if (malloc_def_zone_state < 2) _malloc_initialize();
+ // _malloc_printf(ASL_LEVEL_INFO, "In inline_malloc_default_zone with %d %d\n", malloc_num_zones, malloc_has_debug_zone);
return malloc_zones[0];
}
@@ -120,54 +205,113 @@
return inline_malloc_default_zone();
}
+// For debugging, allow stack logging to both memory and disk to compare their results.
+static void
+stack_logging_log_stack_debug(uint32_t type_flags, uintptr_t zone_ptr, uintptr_t size, uintptr_t ptr_arg, uintptr_t return_val, uint32_t num_hot_to_skip)
+{
+ __disk_stack_logging_log_stack(type_flags, zone_ptr, size, ptr_arg, return_val, num_hot_to_skip);
+ stack_logging_log_stack(type_flags, zone_ptr, size, ptr_arg, return_val, num_hot_to_skip);
+}
+
static void
set_flags_from_environment(void) {
- const char *flag;
- int fd;
-
+ const char *flag;
+ int fd;
+ char **env = * _NSGetEnviron();
+ char **p;
+ char *c;
+
+ if (malloc_debug_file != STDERR_FILENO) {
+ close(malloc_debug_file);
+ malloc_debug_file = STDERR_FILENO;
+ }
+ malloc_debug_flags = 0;
+ stack_logging_enable_logging = 0;
+ stack_logging_dontcompact = 0;
+ malloc_logger = NULL;
+ malloc_check_start = 0;
+ malloc_check_each = 1000;
+ malloc_check_abort = 0;
+ malloc_check_sleep = 100;
+ /*
+ * Given that all environment variables start with "Malloc" we optimize by scanning quickly
+ * first the environment, therefore avoiding repeated calls to getenv().
+ * If we are setu/gid these flags are ignored to prevent a malicious invoker from changing
+ * our behaviour.
+ */
+ for (p = env; (c = *p) != NULL; ++p) {
+ if (!strncmp(c, "Malloc", 6)) {
+ if (issetugid())
+ return;
+ break;
+ }
+ }
+ if (c == NULL)
+ return;
flag = getenv("MallocLogFile");
if (flag) {
fd = open(flag, O_WRONLY|O_APPEND|O_CREAT, 0644);
if (fd >= 0) {
- malloc_debug_file = fd;
- fcntl(fd, F_SETFD, 0); // clear close-on-exec flag XXX why?
+ malloc_debug_file = fd;
+ fcntl(fd, F_SETFD, 0); // clear close-on-exec flag XXX why?
} else {
malloc_printf("Could not open %s, using stderr\n", flag);
}
}
if (getenv("MallocGuardEdges")) {
malloc_debug_flags = SCALABLE_MALLOC_ADD_GUARD_PAGES;
- malloc_printf("protecting edges\n");
+ _malloc_printf(ASL_LEVEL_INFO, "protecting edges\n");
if (getenv("MallocDoNotProtectPrelude")) {
malloc_debug_flags |= SCALABLE_MALLOC_DONT_PROTECT_PRELUDE;
- malloc_printf("... but not protecting prelude guard page\n");
+ _malloc_printf(ASL_LEVEL_INFO, "... but not protecting prelude guard page\n");
}
if (getenv("MallocDoNotProtectPostlude")) {
malloc_debug_flags |= SCALABLE_MALLOC_DONT_PROTECT_POSTLUDE;
- malloc_printf("... but not protecting postlude guard page\n");
+ _malloc_printf(ASL_LEVEL_INFO, "... but not protecting postlude guard page\n");
}
}
flag = getenv("MallocStackLogging");
if (!flag) {
flag = getenv("MallocStackLoggingNoCompact");
stack_logging_dontcompact = 1;
- }
+ }
+ // For debugging, the MallocStackLogging or MallocStackLoggingNoCompact environment variables can be set to
+ // values of "memory", "disk", or "both" to control which stack logging mechanism to use. Those strings appear
+ // in the flag variable, and the strtoul() call below will return 0, so then we can do string comparison on the
+ // value of flag. The default stack logging now is disk stack logging, since memory stack logging is not 64-bit-aware.
if (flag) {
- unsigned val = strtoul(flag, NULL, 0);
+ unsigned long val = strtoul(flag, NULL, 0);
if (val == 1) val = 0;
if (val == -1) val = 0;
- malloc_logger = (val) ? (void *)val : stack_logging_log_stack;
+ if (val) {
+ malloc_logger = (void *)val;
+ _malloc_printf(ASL_LEVEL_INFO, "recording stacks using recorder %p\n", malloc_logger);
+ } else if (strcmp(flag,"memory") == 0) {
+ malloc_logger = stack_logging_log_stack;
+ _malloc_printf(ASL_LEVEL_INFO, "recording malloc stacks in memory using standard recorder\n");
+ } else if (strcmp(flag,"both") == 0) {
+ malloc_logger = stack_logging_log_stack_debug;
+ _malloc_printf(ASL_LEVEL_INFO, "recording malloc stacks to both memory and disk for comparison debugging\n");
+ } else { // the default is to log to disk
+ malloc_logger = __disk_stack_logging_log_stack;
+ _malloc_printf(ASL_LEVEL_INFO, "recording malloc stacks to disk using standard recorder\n");
+ }
stack_logging_enable_logging = 1;
- if (malloc_logger == stack_logging_log_stack) {
- malloc_printf("recording stacks using standard recorder\n");
- } else {
- malloc_printf("recording stacks using recorder %p\n", malloc_logger);
- }
- if (stack_logging_dontcompact) malloc_printf("stack logging compaction turned off; VM can increase rapidly\n");
+ if (stack_logging_dontcompact) {
+ if (malloc_logger == __disk_stack_logging_log_stack) {
+ _malloc_printf(ASL_LEVEL_INFO, "stack logging compaction turned off; size of log files on disk can increase rapidly\n");
+ } else {
+ _malloc_printf(ASL_LEVEL_INFO, "stack logging compaction turned off; VM can increase rapidly\n");
+ }
+ }
}
if (getenv("MallocScribble")) {
malloc_debug_flags |= SCALABLE_MALLOC_DO_SCRIBBLE;
- malloc_printf("enabling scribbling to detect mods to free blocks\n");
+ _malloc_printf(ASL_LEVEL_INFO, "enabling scribbling to detect mods to free blocks\n");
+ }
+ if (getenv("MallocErrorAbort")) {
+ malloc_debug_flags |= SCALABLE_MALLOC_ABORT_ON_ERROR;
+ _malloc_printf(ASL_LEVEL_INFO, "enabling abort() on bad malloc or free\n");
}
flag = getenv("MallocCheckHeapStart");
if (flag) {
@@ -180,29 +324,26 @@
if (malloc_check_each == 0) malloc_check_each = 1;
if (malloc_check_each == -1) malloc_check_each = 1;
}
- malloc_printf("checks heap after %dth operation and each %d operations\n", malloc_check_start, malloc_check_each);
+ _malloc_printf(ASL_LEVEL_INFO, "checks heap after %dth operation and each %d operations\n", malloc_check_start, malloc_check_each);
flag = getenv("MallocCheckHeapAbort");
if (flag)
malloc_check_abort = strtol(flag, NULL, 0);
if (malloc_check_abort)
- malloc_printf("will abort on heap corruption\n");
+ _malloc_printf(ASL_LEVEL_INFO, "will abort on heap corruption\n");
else {
flag = getenv("MallocCheckHeapSleep");
if (flag)
malloc_check_sleep = strtol(flag, NULL, 0);
if (malloc_check_sleep > 0)
- malloc_printf("will sleep for %d seconds on heap corruption\n", malloc_check_sleep);
+ _malloc_printf(ASL_LEVEL_INFO, "will sleep for %d seconds on heap corruption\n", malloc_check_sleep);
else if (malloc_check_sleep < 0)
- malloc_printf("will sleep once for %d seconds on heap corruption\n", -malloc_check_sleep);
+ _malloc_printf(ASL_LEVEL_INFO, "will sleep once for %d seconds on heap corruption\n", -malloc_check_sleep);
else
- malloc_printf("no sleep on heap corruption\n");
- }
- }
- flag = getenv("MallocBadFreeAbort");
- if (flag)
- malloc_free_abort = strtol(flag, NULL, 0);
+ _malloc_printf(ASL_LEVEL_INFO, "no sleep on heap corruption\n");
+ }
+ }
if (getenv("MallocHelp")) {
- malloc_printf(
+ _malloc_printf(ASL_LEVEL_INFO,
"environment variables that can be set for debug:\n"
"- MallocLogFile <f> to create/append messages to file <f> instead of stderr\n"
"- MallocGuardEdges to add 2 guard pages for each large block\n"
@@ -216,28 +357,21 @@
"- MallocCheckHeapEach <s> to repeat the checking of the heap after <s> operations\n"
"- MallocCheckHeapSleep <t> to sleep <t> seconds on heap corruption\n"
"- MallocCheckHeapAbort <b> to abort on heap corruption if <b> is non-zero\n"
- "- MallocBadFreeAbort <b> to abort on a bad free if <b> is non-zero\n"
+ "- MallocErrorAbort to abort on a bad malloc or free\n"
"- MallocHelp - this help!\n");
}
}
malloc_zone_t *
-malloc_create_zone(vm_size_t start_size, unsigned flags) {
+malloc_create_zone(vm_size_t start_size, unsigned flags)
+{
malloc_zone_t *zone;
- if (!malloc_num_zones) {
- char **env = * _NSGetEnviron();
- char **p;
- char *c;
- /* Given that all environment variables start with "Malloc" we optimize by scanning quickly first the environment, therefore avoiding repeated calls to getenv() */
- malloc_debug_file = STDERR_FILENO;
- for (p = env; (c = *p) != NULL; ++p) {
- if (!strncmp(c, "Malloc", 6)) {
- set_flags_from_environment();
- break;
- }
- }
-
- }
+
+ /* start_size doesn't seemed to actually be used, but we test anyways */
+ if (start_size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
+ if (malloc_def_zone_state < 2) _malloc_initialize();
zone = create_scalable_zone(start_size, malloc_debug_flags);
malloc_zone_register(zone);
return zone;
@@ -247,6 +381,16 @@
malloc_destroy_zone(malloc_zone_t *zone) {
malloc_zone_unregister(zone);
zone->destroy(zone);
+}
+
+/* called from the {put,set,unset}env routine */
+__private_extern__ void
+__malloc_check_env_name(const char *name)
+{
+ MALLOC_LOCK();
+ if(malloc_def_zone_state == 2 && strncmp(name, "Malloc", 6) == 0)
+ malloc_def_zone_state = 1;
+ MALLOC_UNLOCK();
}
/********* Block creation and manipulation ************/
@@ -256,16 +400,29 @@
static vm_address_t *frames = NULL;
static unsigned num_frames;
if (malloc_zone_check(NULL)) {
- malloc_printf("MallocCheckHeap: PASSED check at %dth operation\n", malloc_check_counter-1);
+ _malloc_printf(ASL_LEVEL_NOTICE, "MallocCheckHeap: PASSED check at %dth operation\n", malloc_check_counter-1);
if (!frames) vm_allocate(mach_task_self(), (void *)&frames, vm_page_size, 1);
thread_stack_pcs(frames, vm_page_size/sizeof(vm_address_t) - 1, &num_frames);
} else {
malloc_printf("*** MallocCheckHeap: FAILED check at %dth operation\n", malloc_check_counter-1);
if (frames) {
unsigned index = 1;
- malloc_printf("Stack for last operation where the malloc check succeeded: ");
- while (index < num_frames) malloc_printf("%p ", frames[index++]);
- malloc_printf("\n(Use 'atos' for a symbolic stack)\n");
+ _SIMPLE_STRING b = _simple_salloc();
+ if (b) {
+ _simple_sappend(b, "Stack for last operation where the malloc check succeeded: ");
+ while (index < num_frames) _simple_sprintf(b, "%p ", frames[index++]);
+ malloc_printf("%s\n(Use 'atos' for a symbolic stack)\n", _simple_string(b));
+ _simple_sfree(b);
+ } else {
+ /*
+ * Should only get here if vm_allocate() can't get a single page of
+ * memory, implying _simple_asl_log() would also fail. So we just
+ * print to the file descriptor.
+ */
+ _malloc_printf(MALLOC_PRINTF_NOLOG, "Stack for last operation where the malloc check succeeded: ");
+ while (index < num_frames) _malloc_printf(MALLOC_PRINTF_NOLOG, "%p ", frames[index++]);
+ _malloc_printf(MALLOC_PRINTF_NOLOG, "\n(Use 'atos' for a symbolic stack)\n");
+ }
}
if (malloc_check_each > 1) {
unsigned recomm_each = (malloc_check_each > 10) ? malloc_check_each/10 : 1;
@@ -275,11 +432,11 @@
if (malloc_check_abort)
abort();
if (malloc_check_sleep > 0) {
- malloc_printf("*** Sleeping for %d seconds to leave time to attach\n",
+ _malloc_printf(ASL_LEVEL_NOTICE, "*** Sleeping for %d seconds to leave time to attach\n",
malloc_check_sleep);
sleep(malloc_check_sleep);
} else if (malloc_check_sleep < 0) {
- malloc_printf("*** Sleeping once for %d seconds to leave time to attach\n",
+ _malloc_printf(ASL_LEVEL_NOTICE, "*** Sleeping once for %d seconds to leave time to attach\n",
-malloc_check_sleep);
sleep(-malloc_check_sleep);
malloc_check_sleep = 0;
@@ -294,8 +451,11 @@
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
ptr = zone->malloc(zone, size);
- if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, size, 0, (unsigned)ptr, 0);
+ if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
return ptr;
}
@@ -305,8 +465,11 @@
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
ptr = zone->calloc(zone, num_items, size);
- if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE | MALLOC_LOG_TYPE_CLEARED, (unsigned)zone, num_items * size, 0, (unsigned)ptr, 0);
+ if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE | MALLOC_LOG_TYPE_CLEARED, (uintptr_t)zone, (uintptr_t)(num_items * size), 0, (uintptr_t)ptr, 0);
return ptr;
}
@@ -316,8 +479,11 @@
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
ptr = zone->valloc(zone, size);
- if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, size, 0, (unsigned)ptr, 0);
+ if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
return ptr;
}
@@ -327,14 +493,17 @@
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
new_ptr = zone->realloc(zone, ptr, size);
- if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, (unsigned)ptr, size, (unsigned)new_ptr, 0);
+ if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)ptr, (uintptr_t)size, (uintptr_t)new_ptr, 0);
return new_ptr;
}
void
malloc_zone_free(malloc_zone_t *zone, void *ptr) {
- if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, (unsigned)ptr, 0, 0, 0);
+ if (malloc_logger) malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)ptr, 0, 0, 0);
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
@@ -344,32 +513,21 @@
malloc_zone_t *
malloc_zone_from_ptr(const void *ptr) {
malloc_zone_t *zone;
- if (!ptr) return NULL;
+ if (!ptr)
+ return NULL;
zone = find_registered_zone(ptr, NULL);
+ if (zone && zone->size(zone, ptr))
return zone;
+ return NULL;
}
/********* Functions for zone implementors ************/
void
malloc_zone_register(malloc_zone_t *zone) {
- /* Note that given the sequencing it is always safe to first get the number of zones, then get malloc_zones without taking the lock, if all you need is to iterate through the list */
MALLOC_LOCK();
- if (malloc_num_zones >= INITIAL_ZONES) {
- malloc_zone_t **zones = malloc_zones;
- malloc_zone_t *pzone = malloc_zones[0];
- boolean_t copy = malloc_num_zones == INITIAL_ZONES;
- if (copy) zones = NULL; // to avoid realloc on something not allocated
- MALLOC_UNLOCK();
- zones = pzone->realloc(pzone, zones, (malloc_num_zones + 1) * sizeof(malloc_zone_t *)); // we leak initial_malloc_zones, not worth tracking it
- MALLOC_LOCK();
- if (copy) memcpy(zones, malloc_zones, malloc_num_zones * sizeof(malloc_zone_t *));
- malloc_zones = zones;
- }
- malloc_zones[malloc_num_zones] = zone;
- malloc_num_zones++; // note that we do this after setting malloc_num_zones, so enumerations without taking the lock are safe
+ malloc_zone_register_while_locked(zone);
MALLOC_UNLOCK();
- // malloc_printf("Registered %p malloc_zones at address %p is %p [%d zones]\n", zone, &malloc_zones, malloc_zones, malloc_num_zones);
}
void
@@ -407,25 +565,58 @@
}
/*
- * XXX malloc_printf now uses _simple_{,v}dprintf. It only deals with a
+ * XXX malloc_printf now uses _simple_*printf. It only deals with a
* subset of printf format specifiers, but it doesn't call malloc.
*/
-void _simple_dprintf(int, const char *, ...);
-void _simple_vdprintf(int, const char *, va_list);
+
+__private_extern__ void
+_malloc_vprintf(int flags, const char *format, va_list ap)
+{
+ _SIMPLE_STRING b;
+
+ if (_malloc_no_asl_log || (flags & MALLOC_PRINTF_NOLOG) || (b = _simple_salloc()) == NULL) {
+ if (!(flags & MALLOC_PRINTF_NOPREFIX)) {
+ if (__is_threaded) {
+ /* XXX somewhat rude 'knowing' that pthread_t is a pointer */
+ _simple_dprintf(malloc_debug_file, "%s(%d,%p) malloc: ", getprogname(), getpid(), (void *)pthread_self());
+ } else {
+ _simple_dprintf(malloc_debug_file, "%s(%d) malloc: ", getprogname(), getpid());
+ }
+ }
+ _simple_vdprintf(malloc_debug_file, format, ap);
+ return;
+ }
+ if (!(flags & MALLOC_PRINTF_NOPREFIX)) {
+ if (__is_threaded) {
+ /* XXX somewhat rude 'knowing' that pthread_t is a pointer */
+ _simple_sprintf(b, "%s(%d,%p) malloc: ", getprogname(), getpid(), (void *)pthread_self());
+ } else {
+ _simple_sprintf(b, "%s(%d) malloc: ", getprogname(), getpid());
+ }
+ }
+ _simple_vsprintf(b, format, ap);
+ _simple_put(b, malloc_debug_file);
+ _simple_asl_log(flags & MALLOC_PRINTF_LEVEL_MASK, Malloc_Facility, _simple_string(b));
+ _simple_sfree(b);
+}
+
+__private_extern__ void
+_malloc_printf(int flags, const char *format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ _malloc_vprintf(flags, format, ap);
+ va_end(ap);
+}
void
malloc_printf(const char *format, ...)
{
va_list ap;
- if (__is_threaded) {
- /* XXX somewhat rude 'knowing' that pthread_t is a pointer */
- _simple_dprintf(malloc_debug_file, "%s(%d,%p) malloc: ", getprogname(), getpid(), (void *)pthread_self());
- } else {
- _simple_dprintf(malloc_debug_file, "%s(%d) malloc: ", getprogname(), getpid());
- }
va_start(ap, format);
- _simple_vdprintf(malloc_debug_file, format, ap);
+ _malloc_vprintf(ASL_LEVEL_ERR, format, ap);
va_end(ap);
}
@@ -456,32 +647,47 @@
malloc_zone_t *zone;
if (!ptr) return;
zone = find_registered_zone(ptr, NULL);
- if (zone) {
+ if (zone)
malloc_zone_free(zone, ptr);
- } else {
- malloc_printf("*** Deallocation of a pointer not malloced: %p; "
- "This could be a double free(), or free() called with the middle of an allocated block; "
- "Try setting environment variable MallocHelp to see tools to help debug\n", ptr);
- if (malloc_free_abort)
- abort();
- }
}
void *
-realloc(void *old_ptr, size_t new_size) {
- void *retval;
+realloc(void *in_ptr, size_t new_size) {
+ void *retval;
+ void *old_ptr;
malloc_zone_t *zone;
- size_t old_size = 0;
+ size_t old_size = 0;
+
+ // SUSv3: "If size is 0 and ptr is not a null pointer, the object
+ // pointed to is freed. If the space cannot be allocated, the object
+ // shall remain unchanged." Also "If size is 0, either a null pointer
+ // or a unique pointer that can be successfully passed to free() shall
+ // be returned." We choose to allocate a minimum size object by calling
+ // 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) {
retval = malloc_zone_malloc(inline_malloc_default_zone(), new_size);
} else {
zone = find_registered_zone(old_ptr, &old_size);
- if (zone && (old_size >= new_size)) return old_ptr;
- if (!zone) zone = inline_malloc_default_zone();
+ if (zone && (old_size == 0))
+ old_size = zone->size(zone, old_ptr);
+ if (zone && (old_size >= new_size))
+ return old_ptr;
+ /*
+ * if old_size is still 0 here, it means that either zone was NULL or
+ * the call to zone->size() returned 0, indicating the pointer is not
+ * not in that zone. In this case, just use the default zone.
+ */
+ if (old_size == 0)
+ zone = inline_malloc_default_zone();
retval = malloc_zone_realloc(zone, old_ptr, new_size);
}
if (retval == NULL) {
errno = ENOMEM;
+ } else if (new_size == 0) {
+ free(in_ptr);
}
return retval;
}
@@ -506,7 +712,13 @@
malloc_size(const void *ptr) {
size_t size = 0;
if (!ptr) return size;
- (void)find_registered_zone(ptr, &size);
+ malloc_zone_t *zone = find_registered_zone(ptr, &size);
+ /*
+ * If we found a zone, and size is 0 then we need to check to see if that
+ * zone contains ptr. If size is nonzero, then we know zone contains ptr.
+ */
+ if (zone && (size == 0))
+ size = zone->size(zone, ptr);
return size;
}
@@ -529,7 +741,7 @@
if (malloc_logger) {
unsigned index = 0;
while (index < batched) {
- malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, size, 0, (unsigned)results[index], 0);
+ malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)results[index], 0);
index++;
}
}
@@ -544,7 +756,7 @@
if (malloc_logger) {
unsigned index = 0;
while (index < num) {
- malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (unsigned)zone, (unsigned)to_be_freed[index], 0, 0, 0);
+ malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)to_be_freed[index], 0, 0, 0);
index++;
}
}
@@ -612,7 +824,7 @@
malloc_zone_print_ptr_info(void *ptr) {
malloc_zone_t *zone;
if (!ptr) return;
- zone = find_registered_zone(ptr, NULL);
+ zone = malloc_zone_from_ptr(ptr);
if (zone) {
printf("ptr %p in registered zone %p\n", ptr, zone);
} else {
@@ -651,7 +863,7 @@
void
malloc_zone_statistics(malloc_zone_t *zone, malloc_statistics_t *stats) {
if (!zone) {
- memset(stats, 0, sizeof(stats));
+ memset(stats, 0, sizeof(*stats));
unsigned index = 0;
while (index < malloc_num_zones) {
zone = malloc_zones[index++];