From 92ba078919550eaefcf69489ee3a28e42381c786 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sun, 10 Jun 2018 17:31:15 +0200 Subject: [PATCH 1/1] Boost contexts: add an assert checking that we don't mix up originating context. --- src/kernel/context/ContextBoost.cpp | 11 ++++++----- src/kernel/context/ContextBoost.hpp | 1 + src/kernel/context/context_private.hpp | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index 87b490ea80..e508c5646a 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -106,10 +106,10 @@ void BoostContext::wrapper(BoostContext::arg_type arg) #if BOOST_VERSION < 106100 BoostContext* context = reinterpret_cast(arg); #else - ASAN_FINISH_SWITCH(nullptr, &static_cast(arg.data)[0]->asan_stack_, - &static_cast(arg.data)[0]->asan_stack_size_); + BoostContext* context = static_cast(arg.data)[1]; + ASAN_ASSERT(context->asan_ctx_ == static_cast(arg.data)[0]); + ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_); static_cast(arg.data)[0]->fc_ = arg.fctx; - BoostContext* context = static_cast(arg.data)[1]; #endif try { (*context)(); @@ -130,10 +130,11 @@ inline void BoostContext::swap(BoostContext* from, BoostContext* to) #else BoostContext* ctx[2] = {from, to}; void* fake_stack = nullptr; + ASAN_EVAL(to->asan_ctx_ = from); ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx); - ASAN_FINISH_SWITCH(fake_stack, &static_cast(arg.data)[0]->asan_stack_, - &static_cast(arg.data)[0]->asan_stack_size_); + ASAN_ASSERT(from->asan_ctx_ == static_cast(arg.data)[0]); + ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_); static_cast(arg.data)[0]->fc_ = arg.fctx; #endif } diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp index 90d6cc768c..1a9ae4ee26 100644 --- a/src/kernel/context/ContextBoost.hpp +++ b/src/kernel/context/ContextBoost.hpp @@ -58,6 +58,7 @@ private: #if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT const void* asan_stack_ = nullptr; size_t asan_stack_size_ = 0; + BoostContext* asan_ctx_ = nullptr; bool asan_stop_ = false; #endif diff --git a/src/kernel/context/context_private.hpp b/src/kernel/context/context_private.hpp index c2b809ac33..6788e1b730 100644 --- a/src/kernel/context/context_private.hpp +++ b/src/kernel/context/context_private.hpp @@ -10,11 +10,13 @@ #if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT #include +#define ASAN_ASSERT(...) xbt_assert(__VA_ARGS__) #define ASAN_EVAL(expr) (expr) #define ASAN_START_SWITCH(fake_stack_save, bottom, size) __sanitizer_start_switch_fiber(fake_stack_save, bottom, size) #define ASAN_FINISH_SWITCH(fake_stack_save, bottom_old, size_old) \ __sanitizer_finish_switch_fiber(fake_stack_save, bottom_old, size_old) #else +#define ASAN_ASSERT(expr) (void)0 #define ASAN_EVAL(expr) (void)0 #define ASAN_START_SWITCH(fake_stack_save, bottom, size) (void)0 #define ASAN_FINISH_SWITCH(fake_stack_save, bottom_old, size_old) (void)(fake_stack_save) -- 2.20.1