reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-27 05:10:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

executor: fix akaros nonfailing mode

Browse Source
This commit is contained in:
Dmitry Vyukov 2017-10-16 13:57:37 +02:00
parent 85b1f93f8d
commit c2337c94bf
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
executor/common_akaros.h
View File

@ -18,6 +18,7 @@
#include <time.h>
#endif
#if defined(SYZ_EXECUTOR) || defined(SYZ_HANDLE_SEGV)
#include <parlib/parlib.h>
#include <setjmp.h>
#include <signal.h>
#endif
@ -37,6 +38,11 @@
static __thread int skip_segv;
static __thread jmp_buf segv_env;
static void recover()
{
_longjmp(segv_env, 1);
}
static void segv_handler(int sig, siginfo_t* info, void* ctx)
{
// Generated programs can contain bad (unmapped/protected) addresses,
@ -49,10 +55,10 @@ static void segv_handler(int sig, siginfo_t* info, void* ctx)
const uintptr_t prog_start = 1 << 20;
const uintptr_t prog_end = 100 << 20;
if (__atomic_load_n(&skip_segv, __ATOMIC_RELAXED) && (addr < prog_start || addr > prog_end)) {
// Note: this does not work fully. This skips only over the first SIGSEGV in a thread.
// See: https://groups.google.com/forum/#!msg/akaros/d8_uwjAfPic/KAF0WwisBAAJ
debug("SIGSEGV on %p, skipping\n", addr);
siglongjmp(segv_env, 1);
struct user_context* uctx = (struct user_context*)ctx;
uctx->tf.hw_tf.tf_rip = (long)(void*)recover;
return;
}
debug("SIGSEGV on %p, exiting\n", addr);
doexit(sig);

10
pkg/csource/akaros_common.go
View File

@ -19,6 +19,7 @@ var commonHeaderAkaros = `
#include <time.h>
#endif
#if defined(SYZ_EXECUTOR) || defined(SYZ_HANDLE_SEGV)
#include <parlib/parlib.h>
#include <setjmp.h>
#include <signal.h>
#endif
@ -194,6 +195,11 @@ static uint16_t csum_inet_digest(struct csum_inet* csum)
static __thread int skip_segv;
static __thread jmp_buf segv_env;
static void recover()
{
_longjmp(segv_env, 1);
}
static void segv_handler(int sig, siginfo_t* info, void* ctx)
{
uintptr_t addr = (uintptr_t)info->si_addr;
@ -201,7 +207,9 @@ static void segv_handler(int sig, siginfo_t* info, void* ctx)
const uintptr_t prog_end = 100 << 20;
if (__atomic_load_n(&skip_segv, __ATOMIC_RELAXED) && (addr < prog_start || addr > prog_end)) {
debug("SIGSEGV on %p, skipping\n", addr);
siglongjmp(segv_env, 1);
struct user_context* uctx = (struct user_context*)ctx;
uctx->tf.hw_tf.tf_rip = (long)(void*)recover;
return;
}
debug("SIGSEGV on %p, exiting\n", addr);
doexit(sig);