Loading...
--- libmalloc/libmalloc-792.60.6/src/malloc_exclaves.c
+++ libmalloc/libmalloc-792.1.1/src/malloc_exclaves.c
@@ -42,10 +42,6 @@
bool malloc_sanitizer_enabled = false;
-#if CONFIG_MTE
-bool malloc_has_sec_transition = false;
-uint32_t malloc_sec_transition_policy = 0;
-#endif
#if __LIBLIBC_F_ASAN_INSTRUMENTATION
static struct malloc_sanitizer_poison malloc_poison_default = {
@@ -150,9 +146,6 @@
logical_ncpus = _liblibc_plat_num_cpus;
phys_ncpus = _liblibc_plat_num_cpus;
-#if CONFIG_MTE
- malloc_has_sec_transition = xrt__has_sec_transition();
-#endif
const unsigned malloc_debug_flags = MALLOC_ABORT_ON_CORRUPTION |
MALLOC_ABORT_ON_ERROR;
@@ -338,9 +331,8 @@
malloc_zone_malloc_with_options(malloc_zone_t *zone, size_t align,
size_t size, malloc_zone_malloc_options_t options)
{
- if (align != MALLOC_ZONE_MALLOC_DEFAULT_ALIGN &&
- (os_unlikely((align != 0) && (!powerof2(align) ||
- ((size & (align-1)) != 0))))) { // equivalent to (size % align != 0)
+ if (os_unlikely((align != 0) && (!powerof2(align) ||
+ ((size & (align-1)) != 0)))) { // equivalent to (size % align != 0)
return NULL;
}