fix android build

Author: struct

android/jni/Android.mk

@@ -8,12 +8,13 @@ LOCAL_CFLAGS := -DTHREAD_SUPPORT=1 -pthread						\
 	-Wno-format-pedantic -DMALLOC_HOOK=1 -fvisibility=hidden -std=c11		\
 	-DALLOC_SANITY=0 -DUNINIT_READ_SANITY=0 -DCPU_PIN=0 -DEXPERIMENTAL=0		\
 	-DUAF_PTR_PAGE=0 -DVERIFY_BIT_SLOT_CACHE=0 -DNAMED_MAPPINGS=1 -fPIC		\
-	-shared -DDEBUG=1 -DLEAK_DETECTOR=1 -DMEM_USAGE=1 -DUSE_MLOCK=1 -DSCHED_GETCPU	\
-	-g -ggdb3 -fno-omit-frame-pointer
+	-shared -DDEBUG=1 -DLEAK_DETECTOR=1 -DMEM_USAGE=1 -DUSE_MLOCK=1 		\
+	-DMEMORY_TAGGING=0 -DSCHED_GETCPU -g -ggdb3 -fno-omit-frame-pointer
 
 LOCAL_SRC_FILES := ../../src/iso_alloc.c ../../src/iso_alloc_printf.c ../../src/iso_alloc_random.c				\
 				   ../../src/iso_alloc_search.c ../../src/iso_alloc_interfaces.c ../../src/iso_alloc_profiler.c	\
-				   ../../src/iso_alloc_sanity.c ../../src/iso_alloc_util.c ../../src/malloc_hook.c
+				   ../../src/iso_alloc_sanity.c ../../src/iso_alloc_util.c ../../src/malloc_hook.c 		\
+				   ../../src/libc_hook.c ../../src/iso_alloc_mem_tags.c
 
 LOCAL_C_INCLUDES := ../../include/
 

android/jni/Application.mk

@@ -1,2 +1,2 @@
 APP_ABI := arm64-v8a x86_64
-APP_PLATFORM := android-23
+APP_PLATFORM := android-28

src/iso_alloc.c

@@ -511,7 +511,7 @@ INTERNAL_HIDDEN iso_alloc_zone_t *_iso_new_zone(size_t size, bool internal, int3
      * but when we call create_canary_chunks() that will happen anyway */
     p = mmap_rw_pages(total_size, false, name);
 
-#if NAMED_MAPPINGS && __ANDROID__
+#if __ANDROID__ && NAMED_MAPPINGS && MEMORY_TAGGING
     if(new_zone->tagged == false) {
         name = MEM_TAG_NAME;
     }
@@ -1205,15 +1205,13 @@ INTERNAL_HIDDEN iso_alloc_zone_t *iso_find_zone_bitmap_range(const void *restric
         return zone;
     }
 
-    iso_alloc_zone_t *tmp_zone = NULL;
-
     /* Now we check the MRU thread zone cache */
     for(int64_t i = 0; i < zone_cache_count; i++) {
-        tmp_zone = zone_cache[i].zone;
-        bitmap_start = UNMASK_BITMAP_PTR(tmp_zone);
+        zone = zone_cache[i].zone;
+        bitmap_start = UNMASK_BITMAP_PTR(zone);
 
-        if(bitmap_start <= p && (bitmap_start + tmp_zone->bitmap_size) > p) {
-            return tmp_zone;
+        if(bitmap_start <= p && (bitmap_start + zone->bitmap_size) > p) {
+            return zone;
         }
     }
 
@@ -1240,15 +1238,13 @@ INTERNAL_HIDDEN iso_alloc_zone_t *iso_find_zone_range(const void *restrict p) {
         return zone;
     }
 
-    iso_alloc_zone_t *tmp_zone = NULL;
-
     /* Now we check the MRU thread zone cache */
     for(int64_t i = 0; i < zone_cache_count; i++) {
-        tmp_zone = zone_cache[i].zone;
-        user_pages_start = UNMASK_USER_PTR(tmp_zone);
+        zone = zone_cache[i].zone;
+        user_pages_start = UNMASK_USER_PTR(zone);
 
         if(user_pages_start <= p && (user_pages_start + ZONE_USER_SIZE) > p) {
-            return tmp_zone;
+            return zone;
         }
     }
 

src/iso_alloc_interfaces.c

@@ -175,12 +175,7 @@ EXTERNAL_API NO_DISCARD MALLOC_ATTR void *iso_alloc_from_zone_tagged(iso_alloc_z
     iso_alloc_zone_t *_zone = (iso_alloc_zone_t *) zone;
 
     void *p = _iso_alloc(zone, _zone->chunk_size);
-
-#if MEMORY_TAGGING
     return _tag_ptr(p, zone);
-#else
-    return p;
-#endif
 }
 
 EXTERNAL_API NO_DISCARD void *iso_alloc_tag_ptr(void *p, iso_alloc_zone_handle *zone) {

src/iso_alloc_mem_tags.c

@@ -23,22 +23,30 @@ INTERNAL_HIDDEN uint8_t _iso_alloc_get_mem_tag(void *p, iso_alloc_zone_t *zone)
 }
 
 INTERNAL_HIDDEN void *_tag_ptr(void *p, iso_alloc_zone_t *zone) {
+#if MEMORY_TAGGING
     if(UNLIKELY(p == NULL || zone == NULL)) {
         return NULL;
     }
 
     const uint64_t tag = _iso_alloc_get_mem_tag(p, zone);
     return (void *) ((tag << UNTAGGED_BITS) | (uintptr_t) p);
+#else
+    return p;
+#endif
 }
 
 INTERNAL_HIDDEN void *_untag_ptr(void *p, iso_alloc_zone_t *zone) {
+#if MEMORY_TAGGING
     if(UNLIKELY(p == NULL || zone == NULL)) {
         return NULL;
     }
 
     void *untagged_p = (void *) ((uintptr_t) p & TAGGED_PTR_MASK);
     const uint64_t tag = _iso_alloc_get_mem_tag(untagged_p, zone);
     return (void *) ((tag << UNTAGGED_BITS) ^ (uintptr_t) p);
+#else
+    return p;
+#endif
 }
 
 INTERNAL_HIDDEN bool _refresh_zone_mem_tags(iso_alloc_zone_t *zone) {

src/iso_alloc_random.c

@@ -13,7 +13,7 @@
 #include <sys/syscall.h>
 #elif __APPLE__
 #include <Security/SecRandom.h>
-#elif __FreeBSD__ || __linux__
+#elif __FreeBSD__ || __linux__ || __ANDROID__
 #include <sys/random.h>
 #else
 #error "unknown OS"
@@ -32,7 +32,7 @@ INTERNAL_HIDDEN uint64_t rand_uint64(void) {
     ret = syscall(SYS_getrandom, &val, sizeof(val), GRND_NONBLOCK) != sizeof(val);
 #elif __APPLE__
     ret = SecRandomCopyBytes(kSecRandomDefault, sizeof(val), &val);
-#elif __FreeBSD__ || __linux__
+#elif __FreeBSD__ || __linux__ || __ANDROID__
     ret = getrandom(&val, sizeof(val), GRND_NONBLOCK) != sizeof(val);
 #endif
 

src/malloc_hook.c

@@ -114,8 +114,10 @@ static void *libc_memalign(size_t alignment, size_t s, const void *caller) {
     return iso_alloc(s);
 }
 
+#if !__ANDROID__
 void *(*__malloc_hook)(size_t, const void *) = &libc_malloc;
 void *(*__realloc_hook)(void *, size_t, const void *) = &libc_realloc;
 void (*__free_hook)(void *, const void *) = &libc_free;
 void *(*__memalign_hook)(size_t, size_t, const void *) = &libc_memalign;
 #endif
+#endif