From a734d2a6d9c158d7c1419de72fc6caaa98d7f95b Mon Sep 17 00:00:00 2001 From: R3x Date: Mon, 8 Jul 2019 10:52:11 +0000 Subject: sys/netbsd: add the newer vfork syscall --- executor/defs.h | 2 +- executor/syscalls.h | 1 + sys/netbsd/gen/amd64.go | 4 +++- sys/netbsd/sys.txt | 1 + sys/netbsd/sys_amd64.const | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/executor/defs.h b/executor/defs.h index 332a8a477..58e6ab66f 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -125,7 +125,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "49e283b548f639c19dd9a36c2985100da8d35119" +#define SYZ_REVISION "75190c0fbdcd19c01861cd8fa231f6941769dfed" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/executor/syscalls.h b/executor/syscalls.h index a4245cc13..3a1b489ff 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -17062,6 +17062,7 @@ const call_t syscalls[] = { #if GOARCH_amd64 const call_t syscalls[] = { {"__clone", 287}, + {"__vfork14", 282}, {"_lwp_continue", 314}, {"_lwp_create", 309}, {"_lwp_ctl", 325}, diff --git a/sys/netbsd/gen/amd64.go b/sys/netbsd/gen/amd64.go index 3bfff4d7c..76ebb84ad 100644 --- a/sys/netbsd/gen/amd64.go +++ b/sys/netbsd/gen/amd64.go @@ -432,6 +432,7 @@ var syscalls_amd64 = []*Syscall{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "clone_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{255, 256, 512, 1024, 2048, 4096, 8192, 16384}, BitMask: true}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "sp", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {NR: 282, Name: "__vfork14", CallName: "__vfork14", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {NR: 314, Name: "_lwp_continue", CallName: "_lwp_continue", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "lwpid", FldName: "target", TypeSize: 4}}, }}, @@ -1691,6 +1692,7 @@ var consts_amd64 = []ConstValue{ {Name: "SS_DISABLE", Value: 4}, {Name: "SS_ONSTACK", Value: 1}, {Name: "SYS___clone", Value: 287}, + {Name: "SYS___vfork14", Value: 282}, {Name: "SYS__lwp_continue", Value: 314}, {Name: "SYS__lwp_create", Value: 309}, {Name: "SYS__lwp_ctl", Value: 325}, @@ -1866,4 +1868,4 @@ var consts_amd64 = []ConstValue{ {Name: "_UC_STACK", Value: 2}, } -const revision_amd64 = "49e283b548f639c19dd9a36c2985100da8d35119" +const revision_amd64 = "75190c0fbdcd19c01861cd8fa231f6941769dfed" diff --git a/sys/netbsd/sys.txt b/sys/netbsd/sys.txt index df77c5339..5496229b7 100644 --- a/sys/netbsd/sys.txt +++ b/sys/netbsd/sys.txt @@ -115,6 +115,7 @@ exit(code intptr) ptrace(request intptr, pid pid, addr ptr[out, intptr], data intptr) __clone(flags flags[clone_flags], sp buffer[in]) pid fork() pid +__vfork14() pid vfork() pid posix_spawn(pid pid, path ptr[in, string], file_actions ptr[in, posix_spawn_file_actions], attrp ptr[in, posix_spawnattr], argv ptr[in, array[string]], envp ptr[in, array[string]]) pid diff --git a/sys/netbsd/sys_amd64.const b/sys/netbsd/sys_amd64.const index af006dda2..09b227102 100644 --- a/sys/netbsd/sys_amd64.const +++ b/sys/netbsd/sys_amd64.const @@ -81,6 +81,7 @@ SA_RESETHAND = 4 SA_RESTART = 2 SA_SIGINFO = 64 SYS___clone = 287 +SYS___vfork14 = 282 SYS_chdir = 12 SYS_chmod = 15 SYS_chown = 16 -- cgit mrf-deployment