retag the first 16 byte granule upon free

struct · Dec 22, 2023 · df83a0f · df83a0f
1 parent 31b50a1
commit df83a0f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/iso_alloc.c b/src/iso_alloc.c
@@ -1420,9 +1420,6 @@ INTERNAL_HIDDEN void _iso_free_from_zone(void *p, iso_alloc_zone_t *zone, bool p
 
 #if ARM_MTE
     if(_root->arm_mte_enabled == true) {
-        /* We want to catch immediate use-after-free without waiting
-         * for chunks to be free'd from the quarantine so we set a new
-         * random tag for the first 16 byte granule at this address */
         p = iso_mte_create_tag(p, 0x0);
         iso_mte_set_tag(p);
     }
@@ -1488,6 +1485,16 @@ INTERNAL_HIDDEN void _iso_free(void *p, bool permanent) {
         return;
     }
 
+#if ARM_MTE
+    if(_root->arm_mte_enabled == true) {
+        /* We want to catch immediate use-after-free without waiting
+         * for chunks to be free'd from the quarantine so we set a new
+         * random tag for the first 16 byte granule at this address */
+        p = iso_mte_create_tag(p, 0x0);
+        iso_mte_set_tag(p);
+    }
+#endif
+
     LOCK_ROOT();
 
     if(_root->chunk_quarantine_count >= CHUNK_QUARANTINE_SZ) {