diff options
| -rw-r--r-- | .golangci.yml | 17 | ||||
| -rw-r--r-- | executor/defs.h | 34 | ||||
| -rw-r--r-- | pkg/ifuzz/gen/gen.go | 1 | ||||
| -rw-r--r-- | pkg/ifuzz/generated/empty.go | 6 | ||||
| -rw-r--r-- | pkg/ifuzz/generated/insns.go | 2 | ||||
| -rw-r--r-- | sys/akaros/gen/amd64.go | 3 | ||||
| -rw-r--r-- | sys/freebsd/gen/amd64.go | 3 | ||||
| -rw-r--r-- | sys/fuchsia/gen/amd64.go | 3 | ||||
| -rw-r--r-- | sys/fuchsia/gen/arm64.go | 3 | ||||
| -rw-r--r-- | sys/linux/gen/386.go | 3 | ||||
| -rw-r--r-- | sys/linux/gen/amd64.go | 3 | ||||
| -rw-r--r-- | sys/linux/gen/arm.go | 3 | ||||
| -rw-r--r-- | sys/linux/gen/arm64.go | 3 | ||||
| -rw-r--r-- | sys/linux/gen/ppc64le.go | 3 | ||||
| -rw-r--r-- | sys/netbsd/gen/amd64.go | 3 | ||||
| -rw-r--r-- | sys/openbsd/gen/amd64.go | 3 | ||||
| -rw-r--r-- | sys/syz-sysgen/sysgen.go | 1 | ||||
| -rw-r--r-- | sys/test/gen/32_fork_shmem.go | 3 | ||||
| -rw-r--r-- | sys/test/gen/32_shmem.go | 3 | ||||
| -rw-r--r-- | sys/test/gen/64.go | 3 | ||||
| -rw-r--r-- | sys/test/gen/64_fork.go | 3 | ||||
| -rw-r--r-- | sys/trusty/gen/arm.go | 3 | ||||
| -rw-r--r-- | sys/windows/gen/amd64.go | 3 | ||||
| -rw-r--r-- | tools/syz-trace2syz/parser/lex.go | 5 | ||||
| -rw-r--r-- | tools/syz-trace2syz/parser/strace.go | 131 | ||||
| -rw-r--r-- | tools/syz-trace2syz/parser/strace.y | 3 | ||||
| -rw-r--r-- | tools/syz-trace2syz/parser/straceLex.rl | 2 |
27 files changed, 138 insertions, 115 deletions
diff --git a/.golangci.yml b/.golangci.yml index 443aa5d19..69fca755c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,18 +5,11 @@ run: deadline: 8m skip-dirs: - pkg/kd - - pkg/ifuzz/generated - - sys/akaros/gen - - sys/freebsd/gen - - sys/fuchsia/gen - - sys/linux/gen - - sys/netbsd/gen - - sys/openbsd/gen - - sys/windows/gen - - sys/test/gen - - sys/trusty/gen - skip-files: - - "tools/syz-trace2syz/parser/(lex.go|strace.go|straceLex.rl|yaccpar)" + # Autogenerated files take too much time and memory to load, + # even if we skip them with skip-dirs. + # So we define this tag and use it in the autogenerated files. + build-tags: + - codeanalysis linters: enable: diff --git a/executor/defs.h b/executor/defs.h index efeb8d026..3263ee38a 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -5,7 +5,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "33548b018e0972b7e80ce23e422cffc6d583fa02" +#define SYZ_REVISION "9fb99740f068a514f775b2acf8781edb2e641b80" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 @@ -20,7 +20,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "d470f47aa27b4dcd0523226bda343298284900a0" +#define SYZ_REVISION "ca6564bc504f352632c5026882504be36c390787" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -35,7 +35,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "0e2d20173a174d3821ff0c8ef1d25aa9d3ed0e8c" +#define SYZ_REVISION "2765f2a4990fc92d0a4cece168f163730492d608" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 @@ -45,7 +45,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "e40ae54c0119676748b73d4d3f8b1bc887d9eae8" +#define SYZ_REVISION "516ed03211e25f8b8445cf89c9d805a282358102" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 @@ -60,7 +60,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "c481fc548f8495652321938cc664cda692bb3640" +#define SYZ_REVISION "429178b95a20ca1fa93c7938259b944a42907379" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -70,7 +70,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "c3ca596ec5a418716e3ed1df1d9f03f6614fb8c9" +#define SYZ_REVISION "208510224427bc6cd3338d6a96bc5284c6f0c4ca" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "755e72f507bfba544c5361f262fc77fb932a5e2d" +#define SYZ_REVISION "d5af6b878ed3f37b02529abf0cd9c899cc4b3cf3" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "ac163f5b11f81bf7691ef0b1f6e6be60c286f750" +#define SYZ_REVISION "2ad9682cfcaa80da61b92de0ec6ac412968a2a6f" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "c9b32a0e01f79a400b0dde6e9094c8bde5adc209" +#define SYZ_REVISION "7b8bbbb6add148e7e6ef06f3d050b1c0d3708e9e" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -115,7 +115,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "cc25964abdaea89bff562310d8a149aeb2e6514d" +#define SYZ_REVISION "db1d9602f5022150750b100d946feef07e2446c4" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -130,7 +130,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "83fc77c2a3d59b3105442938cf3fa8bf6d8d1f43" +#define SYZ_REVISION "1f7a33a955602d488b0c3f964b983c9f8baf75a3" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -145,7 +145,7 @@ #if GOARCH_32_fork_shmem #define GOARCH "32_fork_shmem" -#define SYZ_REVISION "4ecb2427856989ae50e90163840803c67a3d5fe3" +#define SYZ_REVISION "c1820da1fd3d10373aa40011a453b7479b078078" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -155,7 +155,7 @@ #if GOARCH_32_shmem #define GOARCH "32_shmem" -#define SYZ_REVISION "4e967859e0fb64657ea3197a4db359d3264c66d2" +#define SYZ_REVISION "5c997491edf9b3c7f42853ea0cb2078731b361f2" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 8192 @@ -165,7 +165,7 @@ #if GOARCH_64 #define GOARCH "64" -#define SYZ_REVISION "596ee9bf31191a84ff800056cadc632de17b3b28" +#define SYZ_REVISION "613638e7dbb407c7f6ab73b2c116d763b8311d78" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 @@ -175,7 +175,7 @@ #if GOARCH_64_fork #define GOARCH "64_fork" -#define SYZ_REVISION "db6d91083a89e591aa3206638e817b2d37759fe5" +#define SYZ_REVISION "7467ae0af7e161054ba46c3c4e2c2a2a9c82ba7f" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 8192 @@ -190,7 +190,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "8bbbab029fbcf3cb97cc4d5593b2fc094efc666d" +#define SYZ_REVISION "01527fabe7425df1fb63f49a338dacda3035b3a8" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 @@ -205,7 +205,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "034310d6ce04d3301452f8b1857417b6c9db4825" +#define SYZ_REVISION "75e6a1fa03cbbd34d40cee331e1f7e5f3d26d4ef" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 diff --git a/pkg/ifuzz/gen/gen.go b/pkg/ifuzz/gen/gen.go index f31e5bbc1..80caf1bb5 100644 --- a/pkg/ifuzz/gen/gen.go +++ b/pkg/ifuzz/gen/gen.go @@ -164,6 +164,7 @@ nextInsn: insns = deduped fmt.Printf("// AUTOGENERATED FILE\n\n") + fmt.Printf("// +build !codeanalysis\n\n") fmt.Printf("package generated\n\n") fmt.Printf("import . \"github.com/google/syzkaller/pkg/ifuzz\"\n\n") fmt.Printf("func init() { Insns = insns }\n\n") diff --git a/pkg/ifuzz/generated/empty.go b/pkg/ifuzz/generated/empty.go new file mode 100644 index 000000000..35a053a49 --- /dev/null +++ b/pkg/ifuzz/generated/empty.go @@ -0,0 +1,6 @@ +// Copyright 2019 syzkaller project authors. All rights reserved. +// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. + +// To unbreak build with insns.go is excluded by build tags. + +package generated diff --git a/pkg/ifuzz/generated/insns.go b/pkg/ifuzz/generated/insns.go index eb85e2782..f72d1c349 100644 --- a/pkg/ifuzz/generated/insns.go +++ b/pkg/ifuzz/generated/insns.go @@ -1,5 +1,7 @@ // AUTOGENERATED FILE +// +build !codeanalysis + package generated import . "github.com/google/syzkaller/pkg/ifuzz" diff --git a/sys/akaros/gen/amd64.go b/sys/akaros/gen/amd64.go index fd8fb67a8..e8aa8c5bb 100644 --- a/sys/akaros/gen/amd64.go +++ b/sys/akaros/gen/amd64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_akaros,syz_arch_amd64 package gen @@ -1529,4 +1530,4 @@ var consts_amd64 = []ConstValue{ {Name: "WUNTRACED", Value: 2}, } -const revision_amd64 = "33548b018e0972b7e80ce23e422cffc6d583fa02" +const revision_amd64 = "9fb99740f068a514f775b2acf8781edb2e641b80" diff --git a/sys/freebsd/gen/amd64.go b/sys/freebsd/gen/amd64.go index b0c647a6a..c5435dcd7 100644 --- a/sys/freebsd/gen/amd64.go +++ b/sys/freebsd/gen/amd64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_freebsd,syz_arch_amd64 package gen @@ -5704,4 +5705,4 @@ var consts_amd64 = []ConstValue{ {Name: "WUNTRACED", Value: 2}, } -const revision_amd64 = "d470f47aa27b4dcd0523226bda343298284900a0" +const revision_amd64 = "ca6564bc504f352632c5026882504be36c390787" diff --git a/sys/fuchsia/gen/amd64.go b/sys/fuchsia/gen/amd64.go index 46cbd1f06..5915adc18 100644 --- a/sys/fuchsia/gen/amd64.go +++ b/sys/fuchsia/gen/amd64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_fuchsia,syz_arch_amd64 package gen @@ -7715,4 +7716,4 @@ var consts_amd64 = []ConstValue{ {Name: "fuchsia_power_Status_OK"}, } -const revision_amd64 = "0e2d20173a174d3821ff0c8ef1d25aa9d3ed0e8c" +const revision_amd64 = "2765f2a4990fc92d0a4cece168f163730492d608" diff --git a/sys/fuchsia/gen/arm64.go b/sys/fuchsia/gen/arm64.go index a74749357..7e10f1d39 100644 --- a/sys/fuchsia/gen/arm64.go +++ b/sys/fuchsia/gen/arm64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_fuchsia,syz_arch_arm64 package gen @@ -7715,4 +7716,4 @@ var consts_arm64 = []ConstValue{ {Name: "fuchsia_power_Status_OK"}, } -const revision_arm64 = "e40ae54c0119676748b73d4d3f8b1bc887d9eae8" +const revision_arm64 = "516ed03211e25f8b8445cf89c9d805a282358102" diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index 980fd7a0b..52ce1773b 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_linux,syz_arch_386 syz_target,syz_os_linux,syz_arch_amd64 package gen @@ -51065,4 +51066,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "c481fc548f8495652321938cc664cda692bb3640" +const revision_386 = "429178b95a20ca1fa93c7938259b944a42907379" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index 354be1fd1..0514fc660 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_linux,syz_arch_amd64 package gen @@ -51587,4 +51588,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "c3ca596ec5a418716e3ed1df1d9f03f6614fb8c9" +const revision_amd64 = "208510224427bc6cd3338d6a96bc5284c6f0c4ca" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index 162870c3b..a0ef37436 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_linux,syz_arch_arm syz_target,syz_os_linux,syz_arch_arm64 package gen @@ -50552,4 +50553,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "755e72f507bfba544c5361f262fc77fb932a5e2d" +const revision_arm = "d5af6b878ed3f37b02529abf0cd9c899cc4b3cf3" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 9b50ff104..0d0dc14c3 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_linux,syz_arch_arm64 package gen @@ -50847,4 +50848,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "ac163f5b11f81bf7691ef0b1f6e6be60c286f750" +const revision_arm64 = "2ad9682cfcaa80da61b92de0ec6ac412968a2a6f" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index a1b82a3cf..f64ca52ff 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_linux,syz_arch_ppc64le package gen @@ -50814,4 +50815,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "c9b32a0e01f79a400b0dde6e9094c8bde5adc209" +const revision_ppc64le = "7b8bbbb6add148e7e6ef06f3d050b1c0d3708e9e" diff --git a/sys/netbsd/gen/amd64.go b/sys/netbsd/gen/amd64.go index 04b9cbab2..3d3fa583c 100644 --- a/sys/netbsd/gen/amd64.go +++ b/sys/netbsd/gen/amd64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_netbsd,syz_arch_amd64 package gen @@ -1640,4 +1641,4 @@ var consts_amd64 = []ConstValue{ {Name: "WUNTRACED", Value: 2}, } -const revision_amd64 = "cc25964abdaea89bff562310d8a149aeb2e6514d" +const revision_amd64 = "db1d9602f5022150750b100d946feef07e2446c4" diff --git a/sys/openbsd/gen/amd64.go b/sys/openbsd/gen/amd64.go index a05ffd498..7176c2e6c 100644 --- a/sys/openbsd/gen/amd64.go +++ b/sys/openbsd/gen/amd64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_openbsd,syz_arch_amd64 package gen @@ -2874,4 +2875,4 @@ var consts_amd64 = []ConstValue{ {Name: "__MAP_NOREPLACE", Value: 2048}, } -const revision_amd64 = "83fc77c2a3d59b3105442938cf3fa8bf6d8d1f43" +const revision_amd64 = "1f7a33a955602d488b0c3f964b983c9f8baf75a3" diff --git a/sys/syz-sysgen/sysgen.go b/sys/syz-sysgen/sysgen.go index 467987c45..c5f2be3d3 100644 --- a/sys/syz-sysgen/sysgen.go +++ b/sys/syz-sysgen/sysgen.go @@ -166,6 +166,7 @@ func generate(target *targets.Target, prg *compiler.Prog, consts map[string]uint tag += fmt.Sprintf(" syz_target,syz_os_%v,syz_arch_%v", target.OS, target.VMArch) } fmt.Fprintf(out, "// AUTOGENERATED FILE\n") + fmt.Fprintf(out, "// +build !codeanalysis\n") fmt.Fprintf(out, "// +build !syz_target %v\n\n", tag) fmt.Fprintf(out, "package gen\n\n") fmt.Fprintf(out, "import . \"github.com/google/syzkaller/prog\"\n") diff --git a/sys/test/gen/32_fork_shmem.go b/sys/test/gen/32_fork_shmem.go index 6043da2e4..6b9d5f43c 100644 --- a/sys/test/gen/32_fork_shmem.go +++ b/sys/test/gen/32_fork_shmem.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_test,syz_arch_32_fork_shmem package gen @@ -119,4 +120,4 @@ var consts_32_fork_shmem = []ConstValue{ {Name: "ONLY_32BITS_CONST", Value: 1}, } -const revision_32_fork_shmem = "4ecb2427856989ae50e90163840803c67a3d5fe3" +const revision_32_fork_shmem = "c1820da1fd3d10373aa40011a453b7479b078078" diff --git a/sys/test/gen/32_shmem.go b/sys/test/gen/32_shmem.go index be89defb3..71839f4a5 100644 --- a/sys/test/gen/32_shmem.go +++ b/sys/test/gen/32_shmem.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_test,syz_arch_32_shmem package gen @@ -119,4 +120,4 @@ var consts_32_shmem = []ConstValue{ {Name: "ONLY_32BITS_CONST", Value: 1}, } -const revision_32_shmem = "4e967859e0fb64657ea3197a4db359d3264c66d2" +const revision_32_shmem = "5c997491edf9b3c7f42853ea0cb2078731b361f2" diff --git a/sys/test/gen/64.go b/sys/test/gen/64.go index 09797261d..573c8152b 100644 --- a/sys/test/gen/64.go +++ b/sys/test/gen/64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_test,syz_arch_64 package gen @@ -1005,4 +1006,4 @@ var consts_64 = []ConstValue{ {Name: "SYS_unsupported"}, } -const revision_64 = "596ee9bf31191a84ff800056cadc632de17b3b28" +const revision_64 = "613638e7dbb407c7f6ab73b2c116d763b8311d78" diff --git a/sys/test/gen/64_fork.go b/sys/test/gen/64_fork.go index 33267bc26..6e1b38b7e 100644 --- a/sys/test/gen/64_fork.go +++ b/sys/test/gen/64_fork.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_test,syz_arch_64_fork package gen @@ -118,4 +119,4 @@ var consts_64_fork = []ConstValue{ {Name: "IPPROTO_UDP", Value: 17}, } -const revision_64_fork = "db6d91083a89e591aa3206638e817b2d37759fe5" +const revision_64_fork = "7467ae0af7e161054ba46c3c4e2c2a2a9c82ba7f" diff --git a/sys/trusty/gen/arm.go b/sys/trusty/gen/arm.go index 5b0156572..781f60f3a 100644 --- a/sys/trusty/gen/arm.go +++ b/sys/trusty/gen/arm.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_trusty,syz_arch_arm package gen @@ -173,4 +174,4 @@ var consts_arm = []ConstValue{ {Name: "__NR_write", Value: 1}, } -const revision_arm = "8bbbab029fbcf3cb97cc4d5593b2fc094efc666d" +const revision_arm = "01527fabe7425df1fb63f49a338dacda3035b3a8" diff --git a/sys/windows/gen/amd64.go b/sys/windows/gen/amd64.go index c74905311..88cf6bc21 100644 --- a/sys/windows/gen/amd64.go +++ b/sys/windows/gen/amd64.go @@ -1,4 +1,5 @@ // AUTOGENERATED FILE +// +build !codeanalysis // +build !syz_target syz_target,syz_os_windows,syz_arch_amd64 package gen @@ -14618,4 +14619,4 @@ var consts_amd64 = []ConstValue{ {Name: "WRITE_OWNER", Value: 524288}, } -const revision_amd64 = "034310d6ce04d3301452f8b1857417b6c9db4825" +const revision_amd64 = "75e6a1fa03cbbd34d40cee331e1f7e5f3d26d4ef" diff --git a/tools/syz-trace2syz/parser/lex.go b/tools/syz-trace2syz/parser/lex.go index 12df80674..ddffeda04 100644 --- a/tools/syz-trace2syz/parser/lex.go +++ b/tools/syz-trace2syz/parser/lex.go @@ -1,9 +1,8 @@ //line straceLex.rl:1 - // Copyright 2018 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. -// nolint +// +build !codeanalysis package parser @@ -24,6 +23,7 @@ const strace_en_comment int = 207 const strace_en_main int = 157 //line straceLex.rl:22 + type Stracelexer struct { result *Syscall data []byte @@ -5786,6 +5786,7 @@ func (lex *Stracelexer) Lex(out *StraceSymType) int { } //line straceLex.rl:110 + return tok } diff --git a/tools/syz-trace2syz/parser/strace.go b/tools/syz-trace2syz/parser/strace.go index 31719b587..25a2bb284 100644 --- a/tools/syz-trace2syz/parser/strace.go +++ b/tools/syz-trace2syz/parser/strace.go @@ -1,17 +1,18 @@ // Code generated by goyacc -o strace.go -p Strace -v= strace.y. DO NOT EDIT. //line strace.y:2 - // Copyright 2018 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. -// nolint +// +build !codeanalysis + package parser import __yyfmt__ "fmt" -//line strace.y:6 -//line strace.y:12 +//line strace.y:7 + +//line strace.y:13 type StraceSymType struct { yys int data string @@ -601,84 +602,84 @@ Stracedefault: case 1: StraceDollar = StraceS[Stracept-4 : Stracept+1] -//line strace.y:62 +//line strace.y:63 { StraceVAL.val_syscall = NewSyscall(-1, StraceDollar[1].data, StraceDollar[3].val_types, int64(-1), true, false) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 2: StraceDollar = StraceS[Stracept-5 : Stracept+1] -//line strace.y:65 +//line strace.y:66 { StraceVAL.val_syscall = NewSyscall(-1, "tmp", nil, -1, true, true) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 3: StraceDollar = StraceS[Stracept-6 : Stracept+1] -//line strace.y:70 +//line strace.y:71 { StraceVAL.val_syscall = NewSyscall(-1, StraceDollar[1].data, nil, int64(StraceDollar[6].val_int), false, false) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 4: StraceDollar = StraceS[Stracept-5 : Stracept+1] -//line strace.y:75 +//line strace.y:76 { StraceVAL.val_syscall = NewSyscall(-1, "tmp", StraceDollar[2].val_types, StraceDollar[5].val_ret_type, false, true) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 5: StraceDollar = StraceS[Stracept-5 : Stracept+1] -//line strace.y:77 +//line strace.y:78 { StraceVAL.val_syscall = NewSyscall(-1, "tmp", StraceDollar[2].val_types, -1, false, true) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 6: StraceDollar = StraceS[Stracept-8 : Stracept+1] -//line strace.y:79 +//line strace.y:80 { StraceVAL.val_syscall = NewSyscall(-1, "tmp", StraceDollar[2].val_types, StraceDollar[5].val_ret_type, false, true) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 7: StraceDollar = StraceS[Stracept-9 : Stracept+1] -//line strace.y:82 +//line strace.y:83 { StraceVAL.val_syscall = NewSyscall(-1, "tmp", StraceDollar[2].val_types, StraceDollar[5].val_ret_type, false, true) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 8: StraceDollar = StraceS[Stracept-6 : Stracept+1] -//line strace.y:84 +//line strace.y:85 { StraceVAL.val_syscall = NewSyscall(-1, StraceDollar[1].data, StraceDollar[3].val_types, StraceDollar[6].val_ret_type, false, false) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 9: StraceDollar = StraceS[Stracept-6 : Stracept+1] -//line strace.y:87 +//line strace.y:88 { StraceVAL.val_syscall = NewSyscall(-1, StraceDollar[1].data, StraceDollar[3].val_types, -1, false, false) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 10: StraceDollar = StraceS[Stracept-10 : Stracept+1] -//line strace.y:90 +//line strace.y:91 { StraceVAL.val_syscall = NewSyscall(-1, StraceDollar[1].data, StraceDollar[3].val_types, StraceDollar[6].val_ret_type, false, false) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 11: StraceDollar = StraceS[Stracept-9 : Stracept+1] -//line strace.y:93 +//line strace.y:94 { StraceVAL.val_syscall = NewSyscall(-1, StraceDollar[1].data, StraceDollar[3].val_types, StraceDollar[6].val_ret_type, false, false) Stracelex.(*Stracelexer).result = StraceVAL.val_syscall } case 12: StraceDollar = StraceS[Stracept-2 : Stracept+1] -//line strace.y:96 +//line strace.y:97 { call := StraceDollar[2].val_syscall call.Pid = StraceDollar[1].val_int @@ -686,297 +687,297 @@ Stracedefault: } case 13: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:99 +//line strace.y:100 { StraceVAL.val_type = nil } case 14: StraceDollar = StraceS[Stracept-2 : Stracept+1] -//line strace.y:100 +//line strace.y:101 { StraceVAL.val_type = nil } case 15: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:103 +//line strace.y:104 { StraceVAL.val_type = nil } case 16: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:104 +//line strace.y:105 { StraceVAL.val_type = nil } case 17: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:105 +//line strace.y:106 { StraceVAL.val_type = nil } case 18: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:106 +//line strace.y:107 { StraceVAL.val_type = nil } case 19: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:107 +//line strace.y:108 { StraceVAL.val_type = nil } case 20: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:108 +//line strace.y:109 { StraceVAL.val_type = nil } case 21: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:109 +//line strace.y:110 { StraceVAL.val_type = nil } case 22: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:110 +//line strace.y:111 { StraceVAL.val_type = nil } case 23: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:111 +//line strace.y:112 { StraceVAL.val_type = nil } case 24: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:112 +//line strace.y:113 { StraceVAL.val_type = nil } case 25: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:113 +//line strace.y:114 { StraceVAL.val_type = nil } case 26: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:116 +//line strace.y:117 { StraceVAL.val_ret_type = StraceDollar[1].val_int } case 27: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:117 +//line strace.y:118 { StraceVAL.val_ret_type = int64(StraceDollar[1].val_uint) } case 28: StraceDollar = StraceS[Stracept-2 : Stracept+1] -//line strace.y:118 +//line strace.y:119 { StraceVAL.val_ret_type = -1 * StraceDollar[2].val_int } case 29: StraceDollar = StraceS[Stracept-0 : Stracept+1] -//line strace.y:121 +//line strace.y:122 { StraceVAL.val_types = []IrType{} } case 30: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:122 +//line strace.y:123 { StraceDollar[1].val_types = append(StraceDollar[1].val_types, StraceDollar[3].val_type) StraceVAL.val_types = StraceDollar[1].val_types } case 31: StraceDollar = StraceS[Stracept-2 : Stracept+1] -//line strace.y:123 +//line strace.y:124 { StraceDollar[1].val_types = append(StraceDollar[1].val_types, StraceDollar[2].val_type) StraceVAL.val_types = StraceDollar[1].val_types } case 32: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:126 +//line strace.y:127 { StraceVAL.val_type = StraceDollar[1].val_buf_type } case 33: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:127 +//line strace.y:128 { StraceVAL.val_type = StraceDollar[1].val_type } case 34: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:128 +//line strace.y:129 { StraceVAL.val_type = StraceDollar[1].val_group_type } case 35: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:129 +//line strace.y:130 { StraceVAL.val_type = StraceDollar[1].val_constant } case 36: StraceDollar = StraceS[Stracept-2 : Stracept+1] -//line strace.y:130 +//line strace.y:131 { StraceVAL.val_type = StraceDollar[2].val_group_type } case 37: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:133 +//line strace.y:134 { StraceVAL.val_constant = Constant(StraceDollar[1].val_int) } case 38: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:134 +//line strace.y:135 { StraceVAL.val_constant = Constant(StraceDollar[1].val_uint) } case 39: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:135 +//line strace.y:136 { StraceVAL.val_constant = Constant(uint64(0)) } case 40: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:136 +//line strace.y:137 { StraceVAL.val_constant = StraceDollar[1].val_constant | StraceDollar[3].val_constant } case 41: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:137 +//line strace.y:138 { StraceVAL.val_constant = StraceDollar[1].val_constant & StraceDollar[3].val_constant } case 42: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:138 +//line strace.y:139 { StraceVAL.val_constant = StraceDollar[1].val_constant << StraceDollar[3].val_constant } case 43: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:139 +//line strace.y:140 { StraceVAL.val_constant = StraceDollar[1].val_constant >> StraceDollar[3].val_constant } case 44: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:140 +//line strace.y:141 { StraceVAL.val_constant = StraceDollar[2].val_constant } case 45: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:141 +//line strace.y:142 { StraceVAL.val_constant = StraceDollar[1].val_constant * StraceDollar[3].val_constant } case 46: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:142 +//line strace.y:143 { StraceVAL.val_constant = StraceDollar[1].val_constant - StraceDollar[3].val_constant } case 47: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:143 +//line strace.y:144 { StraceVAL.val_constant = StraceDollar[1].val_constant + StraceDollar[3].val_constant } case 48: StraceDollar = StraceS[Stracept-2 : Stracept+1] -//line strace.y:144 +//line strace.y:145 { StraceVAL.val_constant = ^StraceDollar[2].val_constant } case 49: StraceDollar = StraceS[Stracept-2 : Stracept+1] -//line strace.y:145 +//line strace.y:146 { StraceVAL.val_constant = Constant(-int64(StraceDollar[2].val_constant)) } case 50: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:148 +//line strace.y:149 { StraceVAL.val_group_type = newGroupType(StraceDollar[2].val_types) } case 51: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:149 +//line strace.y:150 { StraceVAL.val_group_type = newGroupType(StraceDollar[2].val_types) } case 52: StraceDollar = StraceS[Stracept-4 : Stracept+1] -//line strace.y:150 +//line strace.y:151 { StraceVAL.val_group_type = newGroupType(StraceDollar[2].val_types) } case 53: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:153 +//line strace.y:154 { StraceVAL.val_type = StraceDollar[3].val_type } case 54: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:154 +//line strace.y:155 { StraceVAL.val_type = StraceDollar[3].val_type } case 55: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:155 +//line strace.y:156 { StraceVAL.val_type = StraceDollar[3].val_type } case 56: StraceDollar = StraceS[Stracept-3 : Stracept+1] -//line strace.y:156 +//line strace.y:157 { StraceVAL.val_type = StraceDollar[1].val_type } case 57: StraceDollar = StraceS[Stracept-6 : Stracept+1] -//line strace.y:157 +//line strace.y:158 { StraceVAL.val_type = StraceDollar[6].val_type } case 58: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:160 +//line strace.y:161 { StraceVAL.val_buf_type = newBufferType(StraceDollar[1].data) } case 59: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:161 +//line strace.y:162 { StraceVAL.val_buf_type = newBufferType(StraceDollar[1].data) } case 60: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:162 +//line strace.y:163 { StraceVAL.val_buf_type = newBufferType(StraceDollar[1].data) } case 61: StraceDollar = StraceS[Stracept-1 : Stracept+1] -//line strace.y:163 +//line strace.y:164 { StraceVAL.val_buf_type = newBufferType(StraceDollar[1].data) } diff --git a/tools/syz-trace2syz/parser/strace.y b/tools/syz-trace2syz/parser/strace.y index fe3a8455d..68018712f 100644 --- a/tools/syz-trace2syz/parser/strace.y +++ b/tools/syz-trace2syz/parser/strace.y @@ -2,7 +2,8 @@ // Copyright 2018 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. -// nolint +// +build !codeanalysis + package parser %} diff --git a/tools/syz-trace2syz/parser/straceLex.rl b/tools/syz-trace2syz/parser/straceLex.rl index d52446301..60bca466e 100644 --- a/tools/syz-trace2syz/parser/straceLex.rl +++ b/tools/syz-trace2syz/parser/straceLex.rl @@ -1,7 +1,7 @@ // Copyright 2018 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. -// nolint +// +build !codeanalysis package parser |
