diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-01-31 09:56:54 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-01-31 11:35:53 +0100 |
| commit | 937e1ba861aa34554f512e1f6d0b493d89b883fc (patch) | |
| tree | caa96214618ccd1bb652ef9e602a60fc685ce074 /executor | |
| parent | 6fb60a48131bd6ca2bb8ea760f253e057547c429 (diff) | |
executor: fix do_sandbox_none on akaros and test
do_sandbox_none must not exit, it needs to return.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common.h | 2 | ||||
| -rw-r--r-- | executor/common_akaros.h | 2 | ||||
| -rw-r--r-- | executor/common_test.h | 2 | ||||
| -rw-r--r-- | executor/common_windows.h | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/executor/common.h b/executor/common.h index 61600a712..dc1276cf9 100644 --- a/executor/common.h +++ b/executor/common.h @@ -398,8 +398,6 @@ static long syz_execute_func(long text) #include "common_test.h" #elif GOOS_windows #include "common_windows.h" -#elif GOOS_test -#include "common_test.h" #else #error "unknown OS" #endif diff --git a/executor/common_akaros.h b/executor/common_akaros.h index ead67c36c..7886a4996 100644 --- a/executor/common_akaros.h +++ b/executor/common_akaros.h @@ -12,7 +12,7 @@ static void loop(); static int do_sandbox_none(void) { loop(); - doexit(0); + return 0; } #endif diff --git a/executor/common_test.h b/executor/common_test.h index e0390eb68..9e3dcd6ff 100644 --- a/executor/common_test.h +++ b/executor/common_test.h @@ -86,6 +86,6 @@ static void loop(); static int do_sandbox_none(void) { loop(); - doexit(0); + return 0; } #endif diff --git a/executor/common_windows.h b/executor/common_windows.h index d6b786ac1..e9722a360 100644 --- a/executor/common_windows.h +++ b/executor/common_windows.h @@ -108,6 +108,6 @@ static void loop(); static int do_sandbox_none(void) { loop(); - doexit(0); + return 0; } #endif |