format, actions fix

Author: struct

.github/workflows/testsuite.yml

@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: sudo apt install clang clang-format
+      - run: sudo apt install clang clang-format-12
       - run: make format-ci
   testsuite-gcc:
     runs-on: ubuntu-latest

Makefile

@@ -187,7 +187,7 @@ ISO_DTOR_CLEANUP = -DISO_DTOR_CLEANUP=0
 ## Register a signal handler for SIGSEGV that inspects si_addr
 ## for an address managed by IsoAlloc. Optionally used when
 ## UAF_PTR_PAGE is enabled for better crash handling
-SIGNAL_HANDLER = -DSIGNAL_HANDLER=1
+SIGNAL_HANDLER = -DSIGNAL_HANDLER=0
 
 ## If you know your target will have an ARMv8.1-A or newer and
 ## supports Top Byte Ignore (TBI) then you want to enable this
@@ -411,10 +411,10 @@ install:
 	cp -pR build/$(LIBNAME) /usr/lib/
 
 format:
-	clang-format $(SRC_DIR)/*.* tests/*.* include/*.h -i
+	clang-format-12 $(SRC_DIR)/*.* tests/*.* include/*.h -i
 
 format-ci:
-	clang-format --Werror --dry-run $(SRC_DIR)/*.* tests/*.* include/*.h -i
+	clang-format-12 --Werror --dry-run $(SRC_DIR)/*.* tests/*.* include/*.h -i
 
 clean:
 	rm -rf build/* tests_perf_analysis.txt big_tests_perf_analysis.txt gmon.out test_output.txt *.dSYM core* iso_alloc_profiler.data

src/iso_alloc.c

@@ -1401,7 +1401,7 @@ INTERNAL_HIDDEN void iso_free_chunk_from_zone(iso_alloc_zone_t *zone, void *rest
         LOG_AND_ABORT("Chunk at 0x%p of zone[%d] is not %d byte aligned", p, zone->index, ALIGNMENT);
     }
 
-    const uint64_t chunk_offset = (uint64_t)(p - UNMASK_USER_PTR(zone));
+    const uint64_t chunk_offset = (uint64_t) (p - UNMASK_USER_PTR(zone));
     const size_t chunk_number = (chunk_offset >> zone->chunk_size_pow2);
     const bit_slot_t bit_slot = (chunk_number << BITS_PER_CHUNK_SHIFT);
     const bit_slot_t dwords_to_bit_slot = (bit_slot >> BITS_PER_QWORD_SHIFT);
@@ -1669,7 +1669,7 @@ INTERNAL_HIDDEN iso_alloc_zone_t *_iso_free_internal_unlocked(void *p, bool perm
                 /* We only need to refresh this single tag */
                 void *user_pages_start = UNMASK_USER_PTR(zone);
                 uint8_t *_mtp = (user_pages_start - g_page_size - ROUND_UP_PAGE(zone->chunk_count * MEM_TAG_SIZE));
-                uint64_t chunk_offset = (uint64_t)(p - user_pages_start);
+                uint64_t chunk_offset = (uint64_t) (p - user_pages_start);
                 _mtp += (chunk_offset >> zone->chunk_size_pow2);
 
                 /* Generate and write a new tag for this chunk */

src/iso_alloc_mem_tags.c

@@ -14,7 +14,7 @@ INTERNAL_HIDDEN uint8_t _iso_alloc_get_mem_tag(void *p, iso_alloc_zone_t *zone)
     }
 
     uint8_t *_mtp = (user_pages_start - g_page_size - ROUND_UP_PAGE(zone->chunk_count * MEM_TAG_SIZE));
-    const uint64_t chunk_offset = (uint64_t)(p - user_pages_start);
+    const uint64_t chunk_offset = (uint64_t) (p - user_pages_start);
 
     /* Ensure the pointer is a multiple of chunk size */
     if(UNLIKELY((chunk_offset & (zone->chunk_size - 1)) != 0)) {

src/iso_alloc_profiler.c

@@ -160,7 +160,7 @@ INTERNAL_HIDDEN uint64_t _iso_alloc_zone_leak_detector(iso_alloc_zone_t *zone, b
 
     if(profile == false) {
         LOG("Zone[%d] Total number of %d byte chunks(%d) used and free'd (%d) (%d percent), in use = %d", zone->index, zone->chunk_size, zone->chunk_count,
-            was_used, (int32_t)((float) was_used / zone->chunk_count) * 100, in_use);
+            was_used, (int32_t) ((float) was_used / zone->chunk_count) * 100, in_use);
     }
 
     MASK_ZONE_PTRS(zone);
@@ -172,7 +172,7 @@ INTERNAL_HIDDEN uint64_t _iso_alloc_zone_leak_detector(iso_alloc_zone_t *zone, b
      * in use and previously used by this zone */
     if(profile == true) {
         uint64_t total = (in_use + was_used);
-        return (uint64_t)((float) (total / zone->chunk_count) * 100.0);
+        return (uint64_t) ((float) (total / zone->chunk_count) * 100.0);
     }
 #endif
     return in_use;
@@ -395,7 +395,7 @@ INTERNAL_HIDDEN void _iso_alloc_profile(size_t size) {
             used = _iso_alloc_zone_leak_detector(zone, true);
         }
 
-        used = (int32_t)((float) (used / zone->chunk_count) * 100.0);
+        used = (int32_t) ((float) (used / zone->chunk_count) * 100.0);
 
         if(used > CHUNK_USAGE_THRESHOLD) {
             _zone_profiler_map[zone->chunk_size].count++;

src/iso_alloc_search.c

@@ -25,7 +25,7 @@ INTERNAL_HIDDEN void *_iso_alloc_ptr_search(void *n, bool poison) {
                     return search;
                 } else {
 #if UAF_PTR_PAGE
-                    *(uint64_t *) search = (uint64_t)(_root->uaf_ptr_page);
+                    *(uint64_t *) search = (uint64_t) (_root->uaf_ptr_page);
                     return search;
 #endif
                 }
@@ -82,7 +82,7 @@ INTERNAL_HIDDEN void _iso_alloc_search_stack(uint8_t *stack_start) {
                 LOG_AND_ABORT("Chunk at 0x%p of zone[%d] is not %d byte aligned", p, zone->index, ALIGNMENT);
             }
 
-            uint64_t chunk_offset = (uint64_t)(p - (uint64_t *) zone->user_pages_start);
+            uint64_t chunk_offset = (uint64_t) (p - (uint64_t *) zone->user_pages_start);
             LOG("zone[%d] user_pages_start=%p value=%p %lu %d", zone->index, zone->user_pages_start, p, chunk_offset, zone->chunk_size);
 
             /* Ensure the pointer is a multiple of chunk size */

src/iso_alloc_signal.c

@@ -5,9 +5,9 @@
 
 #if SIGNAL_HANDLER
 INTERNAL_HIDDEN void handle_signal(int sig, siginfo_t *si, void *ctx) {
-#if UAF_PTR_PAGE
     void *crash_addr = si->si_addr;
 
+#if UAF_PTR_PAGE
     if(si->si_addr == NULL) {
         LOG_AND_ABORT("si->si_addr == NULL");
     }
@@ -18,8 +18,8 @@ INTERNAL_HIDDEN void handle_signal(int sig, siginfo_t *si, void *ctx) {
        crash_addr <= _root->uaf_ptr_page + (g_page_size * 2)) {
         LOG_AND_ABORT("Use after free detected! Crashed at _root->uaf_ptr_page 0x%x", si->si_addr);
     }
+#endif
 
     LOG_AND_ABORT("Unknown segmentation fault @ 0x%p", crash_addr);
-#endif
 }
 #endif

src/iso_alloc_util.c

@@ -190,5 +190,5 @@ INTERNAL_HIDDEN uint32_t _log2(uint32_t v) {
     v |= v >> 4;
     v |= v >> 8;
     v |= v >> 16;
-    return _log_table[(uint32_t)(v * 0x07C4ACDD) >> 27];
+    return _log_table[(uint32_t) (v * 0x07C4ACDD) >> 27];
 }