Merge pull request #50 from struct/add_name_zone

add new iso_alloc_name_zone interface

Author: struct

README.md

@@ -177,3 +177,5 @@ If all else fails please file an issue on the [github project](https://github.co
 `void iso_verify_zones()` - Verifies the state of all zones. Will abort if inconsistencies are found.
 
 `void iso_verify_zone(iso_alloc_zone_handle *zone)` - Verifies the state of specified zone. Will abort if inconsistencies are found.
+
+`int32_t iso_alloc_name_zone(iso_alloc_zone_handle *zone, char *name)` - Allows naming of custom zones via prctl on Android

include/iso_alloc.h

@@ -37,6 +37,7 @@ EXTERNAL_API uint64_t iso_alloc_zone_mem_usage(iso_alloc_zone_handle *zone);
 EXTERNAL_API uint64_t iso_alloc_mem_usage();
 EXTERNAL_API void iso_verify_zones();
 EXTERNAL_API void iso_verify_zone(iso_alloc_zone_handle *zone);
+EXTERNAL_API int32_t iso_alloc_name_zone(iso_alloc_zone_handle *zone, char *name);
 
 #if EXPERIMENTAL
 EXTERNAL_API void iso_alloc_search_stack(void *p);

include/iso_alloc_internal.h

@@ -571,6 +571,7 @@ INTERNAL_HIDDEN uint64_t rand_uint64(void);
 INTERNAL_HIDDEN size_t _iso_alloc_print_stats();
 INTERNAL_HIDDEN size_t _iso_chunk_size(void *p);
 INTERNAL_HIDDEN int64_t check_canary_no_abort(iso_alloc_zone *zone, void *p);
+INTERNAL_HIDDEN int32_t name_zone(iso_alloc_zone *zone, char *name);
 INTERNAL_HIDDEN int32_t name_mapping(void *p, size_t sz, const char *name);
 INTERNAL_HIDDEN int8_t *_fmt(uint64_t n, uint32_t base);
 INTERNAL_HIDDEN void _iso_alloc_printf(int32_t fd, const char *f, ...);

src/iso_alloc.c

@@ -577,11 +577,20 @@ __attribute__((destructor(LAST_DTOR))) void iso_alloc_dtor(void) {
     UNLOCK_ROOT();
 }
 
+INTERNAL_HIDDEN int32_t name_zone(iso_alloc_zone *zone, char *name) {
+#if NAMED_MAPPINGS && __ANDROID__
+    return name_mapping(zone->user_pages_start, ZONE_USER_SIZE, (const char *) name);
+#else
+    return 0;
+#endif
+}
+
 INTERNAL_HIDDEN int32_t name_mapping(void *p, size_t sz, const char *name) {
 #if NAMED_MAPPINGS && __ANDROID__
     return prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, p, sz, name);
-#endif
+#else
     return 0;
+#endif
 }
 
 INTERNAL_HIDDEN iso_alloc_zone *iso_new_zone(size_t size, bool internal) {

src/iso_alloc_interfaces.c

@@ -135,6 +135,16 @@ EXTERNAL_API NO_DISCARD iso_alloc_zone_handle *iso_alloc_new_zone(size_t size) {
     return zone;
 }
 
+EXTERNAL_API int32_t iso_alloc_name_zone(iso_alloc_zone_handle *zone, char *name) {
+    if(zone == NULL) {
+        return 0;
+    } else {
+        zone = (iso_alloc_zone_handle *) ((uintptr_t) zone ^ (uintptr_t) _root->zone_handle_mask);
+    }
+
+    return name_zone(zone, name);
+}
+
 EXTERNAL_API void iso_alloc_protect_root() {
     _iso_alloc_protect_root();
 }