diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-06-04 12:55:41 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-06-24 09:57:34 +0000 |
| commit | e16e2c9a4cb6937323e861b646792a6c4c978a3c (patch) | |
| tree | 6c513e98e5f465b44a98546d8984485d2c128582 /sys | |
| parent | 90d67044dab68568e8f35bc14b68055dbd166eff (diff) | |
executor: add runner mode
Move all syz-fuzzer logic into syz-executor and remove syz-fuzzer.
Also restore syz-runtest functionality in the manager.
Update #4917 (sets most signal handlers to SIG_IGN)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/linux/init.go | 21 | ||||
| -rw-r--r-- | sys/test/exec.txt | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/sys/linux/init.go b/sys/linux/init.go index faf4a98af..55953eee0 100644 --- a/sys/linux/init.go +++ b/sys/linux/init.go @@ -4,8 +4,6 @@ package linux import ( - "runtime" - "github.com/google/syzkaller/prog" "github.com/google/syzkaller/sys/targets" ) @@ -109,27 +107,8 @@ func InitTarget(target *prog.Target) { int(target.GetConst("XENSTORE_REL_PATH_MAX")), 1 << 16, // gVisor's MaxFilenameLen } - - if target.Arch == runtime.GOARCH { - KCOV_INIT_TRACE = uintptr(target.GetConst("KCOV_INIT_TRACE")) - KCOV_ENABLE = uintptr(target.GetConst("KCOV_ENABLE")) - KCOV_REMOTE_ENABLE = uintptr(target.GetConst("KCOV_REMOTE_ENABLE")) - KCOV_DISABLE = uintptr(target.GetConst("KCOV_DISABLE")) - KCOV_TRACE_PC = uintptr(target.GetConst("KCOV_TRACE_PC")) - KCOV_TRACE_CMP = uintptr(target.GetConst("KCOV_TRACE_CMP")) - } } -var ( - // This should not be here, but for now we expose this for syz-fuzzer. - KCOV_INIT_TRACE uintptr - KCOV_ENABLE uintptr - KCOV_REMOTE_ENABLE uintptr - KCOV_DISABLE uintptr - KCOV_TRACE_PC uintptr - KCOV_TRACE_CMP uintptr -) - type arch struct { unix *targets.UnixNeutralizer diff --git a/sys/test/exec.txt b/sys/test/exec.txt index 4b43b57b0..ffb56610b 100644 --- a/sys/test/exec.txt +++ b/sys/test/exec.txt @@ -9,7 +9,7 @@ syz_compare(want ptr[in, string], want_len bytesize[want], got ptr[in, compare_d syz_compare_int$2(n const[2], v0 intptr, v1 intptr) syz_compare_int$3(n const[3], v0 intptr, v1 intptr, v2 intptr) syz_compare_int$4(n const[4], v0 intptr, v1 intptr, v2 intptr, v3 intptr) -syz_compare_zlib(data ptr[in, array[int8]], size bytesize[data], zdata ptr[in, compressed_image], zsize bytesize[zdata]) (no_generate, no_minimize) +syz_compare_zlib(data ptr[in, array[int8]], size bytesize[data], zdata ptr[in, compressed_image], zsize bytesize[zdata]) (timeout[4000], no_generate, no_minimize) # Copies the data into KCOV buffer verbatim and sets assumed kernel bitness. syz_inject_cover(is64 bool8, ptr ptr[in, array[int8]], size bytesize[ptr]) |