diff options
| author | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2022-05-19 23:03:49 +1200 |
|---|---|---|
| committer | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2022-05-25 15:24:24 +1200 |
| commit | 901525b1079ac02da0122a76d8e4c3546a7f80f6 (patch) | |
| tree | 00cc26ecdf1933663a649adf6d688e4f557a3a5d /coroutine | |
| parent | d020334e9ee6d978bbed09ce96a03a6d6d2490a6 (diff) | |
Add support for address sanitizer for amd64 and arm64.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5926
Diffstat (limited to 'coroutine')
| -rw-r--r-- | coroutine/amd64/Context.h | 25 | ||||
| -rw-r--r-- | coroutine/arm64/Context.h | 25 |
2 files changed, 50 insertions, 0 deletions
diff --git a/coroutine/amd64/Context.h b/coroutine/amd64/Context.h index f626a47225..44daa4e01a 100644 --- a/coroutine/amd64/Context.h +++ b/coroutine/amd64/Context.h @@ -19,10 +19,29 @@ enum {COROUTINE_REGISTERS = 6}; +#if defined(__SANITIZE_ADDRESS__) + #define COROUTINE_SANITIZE_ADDRESS +#elif defined(__has_feature) + #if __has_feature(address_sanitizer) + #define COROUTINE_SANITIZE_ADDRESS + #endif +#endif + +#if defined(COROUTINE_SANITIZE_ADDRESS) +#include <sanitizer/common_interface_defs.h> +#include <sanitizer/asan_interface.h> +#endif + struct coroutine_context { void **stack_pointer; void *argument; + +#if defined(COROUTINE_SANITIZE_ADDRESS) + void *fake_stack; + void *stack_base; + size_t stack_size; +#endif }; typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self); @@ -39,6 +58,12 @@ static inline void coroutine_initialize( ) { assert(start && stack && size >= 1024); +#if defined(COROUTINE_SANITIZE_ADDRESS) + context->fake_stack = NULL; + context->stack_base = stack; + context->stack_size = size; +#endif + // Stack grows down. Force 16-byte alignment. char * top = (char*)stack + size; context->stack_pointer = (void**)((uintptr_t)top & ~0xF); diff --git a/coroutine/arm64/Context.h b/coroutine/arm64/Context.h index dbc6ac94fb..1472621f48 100644 --- a/coroutine/arm64/Context.h +++ b/coroutine/arm64/Context.h @@ -19,10 +19,29 @@ enum {COROUTINE_REGISTERS = 0xb0 / 8}; +#if defined(__SANITIZE_ADDRESS__) + #define COROUTINE_SANITIZE_ADDRESS +#elif defined(__has_feature) + #if __has_feature(address_sanitizer) + #define COROUTINE_SANITIZE_ADDRESS + #endif +#endif + +#if defined(COROUTINE_SANITIZE_ADDRESS) +#include <sanitizer/common_interface_defs.h> +#include <sanitizer/asan_interface.h> +#endif + struct coroutine_context { void **stack_pointer; void *argument; + +#if defined(COROUTINE_SANITIZE_ADDRESS) + void *fake_stack; + void *stack_base; + size_t stack_size; +#endif }; typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self); @@ -39,6 +58,12 @@ static inline void coroutine_initialize( ) { assert(start && stack && size >= 1024); +#if defined(COROUTINE_SANITIZE_ADDRESS) + context->fake_stack = NULL; + context->stack_base = stack; + context->stack_size = size; +#endif + // Stack grows down. Force 16-byte alignment. char * top = (char*)stack + size; context->stack_pointer = (void**)((uintptr_t)top & ~0xF); |