ASAN unpoison whole heap page after adding to size pool

github · Sep 16, 2024 · 50564f8 · 50564f8
1 parent 46ba375
commit 50564f8
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/gc/default.c b/gc/default.c
@@ -2052,6 +2052,7 @@ size_pool_add_page(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t
 
     asan_unlock_freelist(page);
     page->freelist = NULL;
+    asan_unpoison_memory_region(page->body, HEAP_PAGE_SIZE, false);
     for (VALUE p = (VALUE)start; p < start + (slot_count * size_pool->slot_size); p += size_pool->slot_size) {
         heap_page_add_freeobj(objspace, page, p);
     }
@@ -3969,6 +3970,8 @@ gc_sweep_step(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *hea
             sweep_page->freelist = NULL;
             asan_lock_freelist(sweep_page);
 
+            asan_poison_memory_region(sweep_page->body, HEAP_PAGE_SIZE);
+
             objspace->empty_pages_count++;
             sweep_page->free_next = objspace->empty_pages;
             objspace->empty_pages = sweep_page;