vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coroutine-ucontext: Save fake stack for pooled coroutine 

Coroutine may be pooled even after COROUTINE_TERMINATE if
CONFIG_COROUTINE_POOL is enabled and fake stack should be saved in
such a case to keep AddressSanitizerUseAfterReturn working. Even worse,
I'm seeing stack corruption without fake stack being saved.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20240117-asan-v2-1-26f9e1ea6e72@daynix.com>
(cherry picked from commit d9945ccda0)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Akihiko Odaki 2024-01-17 16:06:02 +09:00 committed by Michael Tokarev
parent 005d7236db
commit f413f9fcc9
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
util/coroutine-ucontext.c
View File

@ -119,13 +119,11 @@ void finish_switch_fiber(void *fake_stack_save)
/* always_inline is required to avoid TSan runtime fatal errors. */ /* always_inline is required to avoid TSan runtime fatal errors. */
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
void start_switch_fiber_asan(CoroutineAction action, void **fake_stack_save, void start_switch_fiber_asan(void **fake_stack_save,
const void *bottom, size_t size) const void *bottom, size_t size)
{ {
#ifdef CONFIG_ASAN #ifdef CONFIG_ASAN
__sanitizer_start_switch_fiber( __sanitizer_start_switch_fiber(fake_stack_save, bottom, size);
action == COROUTINE_TERMINATE ? NULL : fake_stack_save,
bottom, size);
#endif #endif
} }
@ -165,7 +163,7 @@ static void coroutine_trampoline(int i0, int i1)
if (!sigsetjmp(self->env, 0)) { if (!sigsetjmp(self->env, 0)) {
CoroutineUContext *leaderp = get_ptr_leader(); CoroutineUContext *leaderp = get_ptr_leader();
start_switch_fiber_asan(COROUTINE_YIELD, &fake_stack_save, start_switch_fiber_asan(&fake_stack_save,
leaderp->stack, leaderp->stack_size); leaderp->stack, leaderp->stack_size);
start_switch_fiber_tsan(&fake_stack_save, self, true); /* true=caller */ start_switch_fiber_tsan(&fake_stack_save, self, true); /* true=caller */
siglongjmp(*(sigjmp_buf *)co->entry_arg, 1); siglongjmp(*(sigjmp_buf *)co->entry_arg, 1);
@ -226,8 +224,7 @@ Coroutine *qemu_coroutine_new(void)
/* swapcontext() in, siglongjmp() back out */ /* swapcontext() in, siglongjmp() back out */
if (!sigsetjmp(old_env, 0)) { if (!sigsetjmp(old_env, 0)) {
start_switch_fiber_asan(COROUTINE_YIELD, &fake_stack_save, co->stack, start_switch_fiber_asan(&fake_stack_save, co->stack, co->stack_size);
co->stack_size);
start_switch_fiber_tsan(&fake_stack_save, start_switch_fiber_tsan(&fake_stack_save,
co, false); /* false=not caller */ co, false); /* false=not caller */
@ -269,10 +266,28 @@ static inline void valgrind_stack_deregister(CoroutineUContext *co)
#endif #endif
#endif #endif
#if defined(CONFIG_ASAN) && defined(CONFIG_COROUTINE_POOL)
static void coroutine_fn terminate_asan(void *opaque)
{
CoroutineUContext *to = DO_UPCAST(CoroutineUContext, base, opaque);
set_current(opaque);
start_switch_fiber_asan(NULL, to->stack, to->stack_size);
G_STATIC_ASSERT(!IS_ENABLED(CONFIG_TSAN));
siglongjmp(to->env, COROUTINE_ENTER);
}
#endif
void qemu_coroutine_delete(Coroutine *co_) void qemu_coroutine_delete(Coroutine *co_)
{ {
CoroutineUContext *co = DO_UPCAST(CoroutineUContext, base, co_); CoroutineUContext *co = DO_UPCAST(CoroutineUContext, base, co_);
#if defined(CONFIG_ASAN) && defined(CONFIG_COROUTINE_POOL)
co_->entry_arg = qemu_coroutine_self();
co_->entry = terminate_asan;
qemu_coroutine_switch(co_->entry_arg, co_, COROUTINE_ENTER);
#endif
#ifdef CONFIG_VALGRIND_H #ifdef CONFIG_VALGRIND_H
valgrind_stack_deregister(co); valgrind_stack_deregister(co);
#endif #endif
@ -305,8 +320,10 @@ qemu_coroutine_switch(Coroutine *from_, Coroutine *to_,
ret = sigsetjmp(from->env, 0); ret = sigsetjmp(from->env, 0);
if (ret == 0) { if (ret == 0) {
start_switch_fiber_asan(action, &fake_stack_save, to->stack, start_switch_fiber_asan(IS_ENABLED(CONFIG_COROUTINE_POOL) ||
to->stack_size); action != COROUTINE_TERMINATE ?
&fake_stack_save : NULL,
to->stack, to->stack_size);
start_switch_fiber_tsan(&fake_stack_save, start_switch_fiber_tsan(&fake_stack_save,
to, false); /* false=not caller */ to, false); /* false=not caller */
siglongjmp(to->env, action); siglongjmp(to->env, action);