clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add sanitizer fiber switching support

Browse Source
This commit is contained in:
Aaron Piotrowski 2021-05-07 11:56:31 -05:00
parent ccc069d0bb
commit af2905968c
No known key found for this signature in database
GPG Key ID: ADD1EF783EDE9EEB
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Zend/zend_fibers.c
View File

@ -39,6 +39,10 @@
# include <limits.h>
#endif
#ifdef __SANITIZE_ADDRESS__
# include <sanitizer/common_interface_defs.h>
#endif
ZEND_API zend_class_entry *zend_ce_fiber;
static zend_class_entry *zend_ce_fiber_error;
@ -180,13 +184,21 @@ static ZEND_NORETURN void zend_fiber_trampoline(transfer_t transfer)
{
zend_fiber_context *context = transfer.data;
#ifdef __SANITIZE_ADDRESS__
__sanitizer_finish_switch_fiber(NULL, &context->stack.bottom, &context->stack.capacity);
#endif
context->caller = transfer.context;
context->function(context);
context->self = NULL;
zend_fiber_suspend_context(context);
#ifdef __SANITIZE_ADDRESS__
__sanitizer_start_switch_fiber(NULL, context->stack.bottom, context->stack.capacity);
#endif
jump_fcontext(context->caller, NULL);
abort();
}
@ -222,8 +234,17 @@ ZEND_API void zend_fiber_switch_context(zend_fiber_context *to)
{
ZEND_ASSERT(to && to->self && to->stack.pointer && "Invalid fiber context");
#ifdef __SANITIZE_ADDRESS__
void *fake_stack;
__sanitizer_start_switch_fiber(&fake_stack, to->stack.pointer, to->stack.size);
#endif
transfer_t transfer = jump_fcontext(to->self, to);
#ifdef __SANITIZE_ADDRESS__
__sanitizer_finish_switch_fiber(fake_stack, &to->stack.bottom, &to->stack.capacity);
#endif
to->self = transfer.context;
}
@ -231,8 +252,17 @@ ZEND_API void zend_fiber_suspend_context(zend_fiber_context *current)
{
ZEND_ASSERT(current && current->caller && current->stack.pointer && "Invalid fiber context");
#ifdef __SANITIZE_ADDRESS__
void *fake_stack;
__sanitizer_start_switch_fiber(&fake_stack, current->stack.bottom, current->stack.capacity);
#endif
transfer_t transfer = jump_fcontext(current->caller, NULL);
#ifdef __SANITIZE_ADDRESS__
__sanitizer_finish_switch_fiber(fake_stack, &current->stack.bottom, &current->stack.capacity);
#endif
current->caller = transfer.context;
}

5
Zend/zend_fibers.h
View File

@ -41,6 +41,11 @@ typedef struct _zend_fiber_stack {
#ifdef HAVE_VALGRIND
int valgrind;
#endif
#ifdef __SANITIZE_ADDRESS__
const void *bottom;
size_t capacity;
#endif
} zend_fiber_stack;
typedef struct _zend_fiber_context {