diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-10-25 18:36:15 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-10-25 18:36:49 +0200 |
| commit | 83d9c30252b401daef8f2ab771c7a665218a8bc9 (patch) | |
| tree | b3774fad07bee2e5b0633ec3488fe3b6daeed946 | |
| parent | bc5423304f0adea0d3fc99f31b390a1cc3133cb0 (diff) | |
sys/netbsd: fix mmap signature
mmap syscall has 7 arguments (one unused padding)
| -rw-r--r-- | executor/syscalls_netbsd.h | 2 | ||||
| -rw-r--r-- | sys/netbsd/amd64.go | 3 | ||||
| -rw-r--r-- | sys/netbsd/init.go | 1 | ||||
| -rw-r--r-- | sys/netbsd/mm.txt | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/executor/syscalls_netbsd.h b/executor/syscalls_netbsd.h index b9f469e78..9b289bb6c 100644 --- a/executor/syscalls_netbsd.h +++ b/executor/syscalls_netbsd.h @@ -2,7 +2,7 @@ #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "afbcea24bf5398f333788540f821f68b9e6fbe66" +#define SYZ_REVISION "2720f43fa507fee4cdf71db3cc7418897f7b14fb" unsigned syscall_count = 43; call_t syscalls[] = { diff --git a/sys/netbsd/amd64.go b/sys/netbsd/amd64.go index bf7b6df10..781d0139f 100644 --- a/sys/netbsd/amd64.go +++ b/sys/netbsd/amd64.go @@ -96,6 +96,7 @@ var syscalls_amd64 = []*Syscall{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mmap_prot", FldName: "prot", TypeSize: 8}}, Vals: []uint64{4, 1, 2, 0}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mmap_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{4096, 0, 16, 512, 128, 1024, 2048, 2, 1}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "pad", TypeSize: 8}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fileoff", FldName: "offset", TypeSize: 8}}, Kind: 1}, }, Ret: &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "ret", TypeSize: 8, ArgDir: 1}}}, {ID: 8, NR: 74, Name: "mprotect", CallName: "mprotect", Args: []Type{ @@ -387,4 +388,4 @@ var consts_amd64 = []ConstValue{ {Name: "S_IXUSR", Value: 64}, } -const revision_amd64 = "afbcea24bf5398f333788540f821f68b9e6fbe66" +const revision_amd64 = "2720f43fa507fee4cdf71db3cc7418897f7b14fb" diff --git a/sys/netbsd/init.go b/sys/netbsd/init.go index a4dc1eb11..f44753e82 100644 --- a/sys/netbsd/init.go +++ b/sys/netbsd/init.go @@ -54,6 +54,7 @@ func (arch *arch) makeMmap(start, npages uint64) *prog.Call { prog.MakeConstArg(meta.Args[3], arch.MAP_ANONYMOUS|arch.MAP_PRIVATE|arch.MAP_FIXED), prog.MakeResultArg(meta.Args[4], nil, invalidFD), prog.MakeConstArg(meta.Args[5], 0), + prog.MakeConstArg(meta.Args[6], 0), }, Ret: prog.MakeReturnArg(meta.Ret), } diff --git a/sys/netbsd/mm.txt b/sys/netbsd/mm.txt index 02de4e21a..abf83b960 100644 --- a/sys/netbsd/mm.txt +++ b/sys/netbsd/mm.txt @@ -4,7 +4,7 @@ include <sys/types.h> include <sys/mman.h> -mmap(addr vma, len len[addr], prot flags[mmap_prot], flags flags[mmap_flags], fd fd, offset fileoff) vma +mmap(addr vma, len len[addr], prot flags[mmap_prot], flags flags[mmap_flags], fd fd, pad const[0], offset fileoff) vma munmap(addr vma, len len[addr]) mprotect(addr vma, len len[addr], prot flags[mmap_prot]) madvise(addr vma, len len[addr], advice flags[madvise_flags]) |