archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Prefix asan_poison_object with rb

Browse source
This commit is contained in:
Peter Zhu 2024-12-18 12:01:09 -05:00
parent fcd44eee09
commit a58675386c
Notes: git 2024-12-19 14:14:53 +00:00
11 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/coverage/coverage.c
View file

@ -243,8 +243,8 @@ method_coverage_i(void *vstart, void *vend, size_t stride, void *data)
VALUE ncoverages = *(VALUE*)data, v;
for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
void *poisoned = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *poisoned = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
if (RB_TYPE_P(v, T_IMEMO) && imemo_type(v) == imemo_ment) {
const rb_method_entry_t *me = (rb_method_entry_t *) v;
@ -287,7 +287,7 @@ method_coverage_i(void *vstart, void *vend, size_t stride, void *data)
}
if (poisoned) {
asan_poison_object(v);
rb_asan_poison_object(v);
}
}
return 0;

6
ext/objspace/objspace.c
View file

@ -81,15 +81,15 @@ heap_iter(void *vstart, void *vend, size_t stride, void *ptr)
VALUE v;
for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
void *poisoned = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *poisoned = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
if (RBASIC(v)->flags) {
(*ctx->cb)(v, ctx->data);
}
if (poisoned) {
asan_poison_object(v);
rb_asan_poison_object(v);
}
}

6
ext/objspace/objspace_dump.c
View file

@ -658,15 +658,15 @@ heap_i(void *vstart, void *vend, size_t stride, void *data)
struct dump_config *dc = (struct dump_config *)data;
VALUE v = (VALUE)vstart;
for (; v != (VALUE)vend; v += stride) {
void *ptr = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *ptr = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
dc->cur_page_slot_size = stride;
if (dc->full_heap || RBASIC(v)->flags)
dump_object(v, dc);
if (ptr) {
asan_poison_object(v);
rb_asan_poison_object(v);
}
}
return 0;

8
gc.c
View file

@ -1478,7 +1478,7 @@ internal_object_p(VALUE obj)
}
}
if (ptr || !RBASIC(obj)->flags) {
asan_poison_object(obj);
rb_asan_poison_object(obj);
}
return 1;
}
@ -4310,21 +4310,21 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
#undef C
void
asan_poison_object(VALUE obj)
rb_asan_poison_object(VALUE obj)
{
MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
asan_poison_memory_region(ptr, rb_gc_obj_slot_size(obj));
}
void
asan_unpoison_object(VALUE obj, bool newobj_p)
rb_asan_unpoison_object(VALUE obj, bool newobj_p)
{
MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
asan_unpoison_memory_region(ptr, rb_gc_obj_slot_size(obj), newobj_p);
}
void *
asan_poisoned_object_p(VALUE obj)
rb_asan_poisoned_object_p(VALUE obj)
{
MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
return __asan_region_is_poisoned(ptr, rb_gc_obj_slot_size(obj));

32
gc/default/default.c
View file

@ -1621,7 +1621,7 @@ static void heap_page_free(rb_objspace_t *objspace, struct heap_page *page);
static inline void
heap_page_add_freeobj(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
{
asan_unpoison_object(obj, false);
rb_asan_unpoison_object(obj, false);
asan_unlock_freelist(page);
@ -1641,7 +1641,7 @@ heap_page_add_freeobj(rb_objspace_t *objspace, struct heap_page *page, VALUE obj
rb_bug("heap_page_add_freeobj: %p is not rvalue.", (void *)obj);
}
asan_poison_object(obj);
rb_asan_poison_object(obj);
gc_report(3, objspace, "heap_page_add_freeobj: add %p to freelist\n", (void *)obj);
}
@ -2291,7 +2291,7 @@ ractor_cache_allocate_slot(rb_objspace_t *objspace, rb_ractor_newobj_cache_t *ca
if (RB_LIKELY(p)) {
VALUE obj = (VALUE)p;
asan_unpoison_object(obj, true);
rb_asan_unpoison_object(obj, true);
heap_cache->freelist = p->next;
#if RGENGC_CHECK_MODE
GC_ASSERT(rb_gc_impl_obj_slot_size(obj) == heap_slot_size(heap_idx));
@ -2341,9 +2341,9 @@ ractor_cache_set_page(rb_objspace_t *objspace, rb_ractor_newobj_cache_t *cache,
page->free_slots = 0;
page->freelist = NULL;
asan_unpoison_object((VALUE)heap_cache->freelist, false);
rb_asan_unpoison_object((VALUE)heap_cache->freelist, false);
GC_ASSERT(RB_TYPE_P((VALUE)heap_cache->freelist, T_NONE));
asan_poison_object((VALUE)heap_cache->freelist);
rb_asan_poison_object((VALUE)heap_cache->freelist);
}
static inline size_t
@ -2926,7 +2926,7 @@ finalize_list(rb_objspace_t *objspace, VALUE zombie)
while (zombie) {
VALUE next_zombie;
struct heap_page *page;
asan_unpoison_object(zombie, false);
rb_asan_unpoison_object(zombie, false);
next_zombie = RZOMBIE(zombie)->next;
page = GET_HEAP_PAGE(zombie);
@ -3247,7 +3247,7 @@ try_move(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *free_page,
VALUE dest = (VALUE)free_page->freelist;
asan_lock_freelist(free_page);
if (dest) {
asan_unpoison_object(dest, false);
rb_asan_unpoison_object(dest, false);
}
else {
/* if we can't get something from the freelist then the page must be
@ -3514,7 +3514,7 @@ gc_sweep_plane(rb_objspace_t *objspace, rb_heap_t *heap, uintptr_t p, bits_t bit
VALUE vp = (VALUE)p;
GC_ASSERT(vp % BASE_SLOT_SIZE == 0);
asan_unpoison_object(vp, false);
rb_asan_unpoison_object(vp, false);
if (bitset & 1) {
switch (BUILTIN_TYPE(vp)) {
default: /* majority case */
@ -3663,9 +3663,9 @@ gc_sweep_page(rb_objspace_t *objspace, rb_heap_t *heap, struct gc_sweep_context
struct free_slot *ptr = sweep_page->freelist;
while (ptr) {
freelist_len++;
asan_unpoison_object((VALUE)ptr, false);
rb_asan_unpoison_object((VALUE)ptr, false);
struct free_slot *next = ptr->next;
asan_poison_object((VALUE)ptr);
rb_asan_poison_object((VALUE)ptr);
ptr = next;
}
asan_lock_freelist(sweep_page);
@ -3712,15 +3712,15 @@ heap_page_freelist_append(struct heap_page *page, struct free_slot *freelist)
asan_unlock_freelist(page);
if (page->freelist) {
struct free_slot *p = page->freelist;
asan_unpoison_object((VALUE)p, false);
rb_asan_unpoison_object((VALUE)p, false);
while (p->next) {
struct free_slot *prev = p;
p = p->next;
asan_poison_object((VALUE)prev);
asan_unpoison_object((VALUE)p, false);
rb_asan_poison_object((VALUE)prev);
rb_asan_unpoison_object((VALUE)p, false);
}
p->next = freelist;
asan_poison_object((VALUE)p);
rb_asan_poison_object((VALUE)p);
}
else {
page->freelist = freelist;
@ -5143,12 +5143,12 @@ gc_verify_heap_pages_(rb_objspace_t *objspace, struct ccan_list_head *head)
while (p) {
VALUE vp = (VALUE)p;
VALUE prev = vp;
asan_unpoison_object(vp, false);
rb_asan_unpoison_object(vp, false);
if (BUILTIN_TYPE(vp) != T_NONE) {
fprintf(stderr, "freelist slot expected to be T_NONE but was: %s\n", rb_obj_info(vp));
}
p = p->next;
asan_poison_object(prev);
rb_asan_poison_object(prev);
}
asan_lock_freelist(page);

4
imemo.c
View file

@ -470,12 +470,12 @@ vm_ccs_free(struct rb_class_cc_entries *ccs, int alive, VALUE klass)
}
else {
if (ptr) {
asan_poison_object((VALUE)cc);
rb_asan_poison_object((VALUE)cc);
}
continue;
}
if (ptr) {
asan_poison_object((VALUE)cc);
rb_asan_poison_object((VALUE)cc);
}
}

14
internal/sanitizers.h
View file

@ -121,7 +121,7 @@ asan_poison_memory_region(const volatile void *ptr, size_t size)
#ifdef RUBY_ASAN_ENABLED
#define asan_poison_object_if(ptr, obj) do { \
if (ptr) asan_poison_object(obj); \
if (ptr) rb_asan_poison_object(obj); \
} while (0)
#else
#define asan_poison_object_if(ptr, obj) ((void)(ptr), (void)(obj))
@ -133,7 +133,7 @@ RUBY_SYMBOL_EXPORT_BEGIN
*
* @param[in] obj target object.
*/
void asan_poison_object(VALUE obj);
void rb_asan_poison_object(VALUE obj);
/**
* This function predicates if the given object is fully addressable or not.
@ -142,7 +142,7 @@ void asan_poison_object(VALUE obj);
* @retval 0 the given object is fully addressable.
* @retval otherwise pointer to first such byte who is poisoned.
*/
void *asan_poisoned_object_p(VALUE obj);
void *rb_asan_poisoned_object_p(VALUE obj);
/**
* This is a variant of asan_unpoison_memory_region that takes a VALUE.
@ -150,7 +150,7 @@ void *asan_poisoned_object_p(VALUE obj);
* @param[in] obj target object.
* @param[in] malloc_p if the memory region is like a malloc's return value or not.
*/
void asan_unpoison_object(VALUE obj, bool newobj_p);
void rb_asan_unpoison_object(VALUE obj, bool newobj_p);
RUBY_SYMBOL_EXPORT_END
@ -184,8 +184,8 @@ asan_unpoison_memory_region(const volatile void *ptr, size_t size, bool malloc_p
static inline void *
asan_unpoison_object_temporary(VALUE obj)
{
void *ptr = asan_poisoned_object_p(obj);
asan_unpoison_object(obj, false);
void *ptr = rb_asan_poisoned_object_p(obj);
rb_asan_unpoison_object(obj, false);
return ptr;
}
@ -193,7 +193,7 @@ static inline void *
asan_poison_object_restore(VALUE obj, void *ptr)
{
if (ptr) {
asan_poison_object(obj);
rb_asan_poison_object(obj);
}
return NULL;
}

16
iseq.c
View file

@ -1441,8 +1441,8 @@ remove_coverage_i(void *vstart, void *vend, size_t stride, void *data)
{
VALUE v = (VALUE)vstart;
for (; v != (VALUE)vend; v += stride) {
void *ptr = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *ptr = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
if (rb_obj_is_iseq(v)) {
rb_iseq_t *iseq = (rb_iseq_t *)v;
@ -4035,8 +4035,8 @@ clear_attr_ccs_i(void *vstart, void *vend, size_t stride, void *data)
{
VALUE v = (VALUE)vstart;
for (; v != (VALUE)vend; v += stride) {
void *ptr = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *ptr = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
clear_attr_cc(v);
asan_poison_object_if(ptr, v);
}
@ -4054,8 +4054,8 @@ clear_bf_ccs_i(void *vstart, void *vend, size_t stride, void *data)
{
VALUE v = (VALUE)vstart;
for (; v != (VALUE)vend; v += stride) {
void *ptr = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *ptr = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
clear_bf_cc(v);
asan_poison_object_if(ptr, v);
}
@ -4075,8 +4075,8 @@ trace_set_i(void *vstart, void *vend, size_t stride, void *data)
VALUE v = (VALUE)vstart;
for (; v != (VALUE)vend; v += stride) {
void *ptr = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *ptr = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
if (rb_obj_is_iseq(v)) {
rb_iseq_trace_set(rb_iseq_check((rb_iseq_t *)v), turnon_events);

4
rjit_c.c
View file

@ -493,8 +493,8 @@ for_each_iseq_i(void *vstart, void *vend, size_t stride, void *data)
VALUE block = (VALUE)data;
VALUE v = (VALUE)vstart;
for (; v != (VALUE)vend; v += stride) {
void *ptr = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *ptr = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
if (rb_obj_is_iseq(v)) {
extern VALUE rb_rjit_iseq_new(rb_iseq_t *iseq);

6
vm_method.c
View file

@ -314,8 +314,8 @@ invalidate_all_refinement_cc(void *vstart, void *vend, size_t stride, void *data
{
VALUE v = (VALUE)vstart;
for (; v != (VALUE)vend; v += stride) {
void *ptr = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *ptr = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
if (RBASIC(v)->flags) { // liveness check
if (imemo_type_p(v, imemo_callcache)) {
@ -327,7 +327,7 @@ invalidate_all_refinement_cc(void *vstart, void *vend, size_t stride, void *data
}
if (ptr) {
asan_poison_object(v);
rb_asan_poison_object(v);
}
}
return 0; // continue to iteration

4
yjit.c
View file

@ -1096,8 +1096,8 @@ for_each_iseq_i(void *vstart, void *vend, size_t stride, void *data)
const struct iseq_callback_data *callback_data = (struct iseq_callback_data *)data;
VALUE v = (VALUE)vstart;
for (; v != (VALUE)vend; v += stride) {
void *ptr = asan_poisoned_object_p(v);
asan_unpoison_object(v, false);
void *ptr = rb_asan_poisoned_object_p(v);
rb_asan_unpoison_object(v, false);
if (rb_obj_is_iseq(v)) {
rb_iseq_t *iseq = (rb_iseq_t *)v;