untag pointers before searching

struct · Jan 20, 2024 · b14a84a · b14a84a
1 parent b4e146b
commit b14a84a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/iso_alloc_mem_tags.c b/src/iso_alloc_mem_tags.c
@@ -24,7 +24,7 @@ INTERNAL_HIDDEN uint8_t _iso_alloc_get_mem_tag(void *p, iso_alloc_zone_t *zone)
     }
 
     _mtp += (chunk_offset / zone->chunk_size);
-    ;
+
     return *_mtp;
 #else
     return 0;

diff --git a/src/iso_alloc_search.c b/src/iso_alloc_search.c
@@ -11,6 +11,12 @@ INTERNAL_HIDDEN void *_iso_alloc_ptr_search(void *n, bool poison) {
     uint8_t *end = NULL;
     const size_t zones_used = _root->zones_used;
 
+#if MEMORY_TAGGING || (ARM_MTE == 1)
+    /* It should be safe to clear these upper bits even
+     * if the pointer wasn't returned by IsoAlloc. */
+    n = (void *) ((uintptr_t) n & TAGGED_PTR_MASK);
+#endif
+
     for(int32_t i = 0; i < zones_used; i++) {
         iso_alloc_zone_t *zone = &_root->zones[i];
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         _mtp += (chunk_offset / zone->chunk_size);
-        ;
         return *_mtp;
     #else
         return 0;
@@ Expand Down @@