1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unpoison THEAP header before reading

Browse Source 
Another ASAN fix.  THEAP header is poisoned, so we need to un-poison
before reading
This commit is contained in:
Aaron Patterson 2020-09-28 09:53:30 -07:00
parent 0555bd8435
commit 85e9cc2c87
No known key found for this signature in database
GPG Key ID: 953170BCB4FFAFC6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transient_heap.c
View File

@ -716,6 +716,7 @@ transient_heap_block_evacuate(struct transient_heap* theap, struct transient_hea
while (marked_index >= 0) { while (marked_index >= 0) {
struct transient_alloc_header *header = alloc_header(block, marked_index); struct transient_alloc_header *header = alloc_header(block, marked_index);
asan_unpoison_memory_region(header, sizeof *header, true);
VALUE obj = header->obj; VALUE obj = header->obj;
TH_ASSERT(header->magic == TRANSIENT_HEAP_ALLOC_MAGIC); TH_ASSERT(header->magic == TRANSIENT_HEAP_ALLOC_MAGIC);
if (header->magic != TRANSIENT_HEAP_ALLOC_MAGIC) rb_bug("rb_transient_heap_mark: wrong header %s\n", rb_obj_info(obj)); if (header->magic != TRANSIENT_HEAP_ALLOC_MAGIC) rb_bug("rb_transient_heap_mark: wrong header %s\n", rb_obj_info(obj));
@ -744,6 +745,7 @@ transient_heap_block_evacuate(struct transient_heap* theap, struct transient_hea
header->obj = Qundef; /* for debug */ header->obj = Qundef; /* for debug */
} }
marked_index = header->next_marked_index; marked_index = header->next_marked_index;
asan_poison_memory_region(header, sizeof *header);
} }
} }