From a8927abe6c1b5b5e11339ee5958ad2f365ad3067 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 1 Jan 2018 11:23:45 +0100 Subject: [PATCH] prog: support opt for proc types --- executor/syscalls_linux.h | 10 +- executor/syscalls_test.h | 12 ++- pkg/compiler/testdata/errors.txt | 1 + pkg/compiler/types.go | 9 +- prog/encodingexec_test.go | 17 ++++ prog/mutation_test.go | 6 ++ prog/prog.go | 3 + prog/types.go | 5 + prog/validation.go | 2 +- sys/linux/386.go | 22 ++--- sys/linux/amd64.go | 22 ++--- sys/linux/arm.go | 22 ++--- sys/linux/arm64.go | 22 ++--- sys/linux/ppc64le.go | 22 ++--- sys/linux/socket_key.txt | 4 +- sys/linux/socket_netlink_xfrm.txt | 16 ++-- sys/test/32.go | 148 ++++++++++++++++-------------- sys/test/64.go | 148 ++++++++++++++++-------------- sys/test/test.txt | 2 + 19 files changed, 269 insertions(+), 224 deletions(-) diff --git a/executor/syscalls_linux.h b/executor/syscalls_linux.h index 90c0dcda..07b6e935 100644 --- a/executor/syscalls_linux.h +++ b/executor/syscalls_linux.h @@ -2,7 +2,7 @@ #if defined(__i386__) || 0 #define GOARCH "386" -#define SYZ_REVISION "a422d870ebcb6d4c7a0bc930660401fa661e5a6e" +#define SYZ_REVISION "61a1470bb1a43c7bd36f95380a36757f8965dd69" #define __NR_syz_emit_ethernet 1000000 #define __NR_syz_extract_tcp_res 1000001 #define __NR_syz_fuse_mount 1000002 @@ -1489,7 +1489,7 @@ call_t syscalls[] = { #if defined(__x86_64__) || 0 #define GOARCH "amd64" -#define SYZ_REVISION "30a3d7b3bf83f83a7b8d55ee7989ada3383f37f2" +#define SYZ_REVISION "321f7567e5ebda4b1d2b170d83c76869d62b8b36" #define __NR_syz_emit_ethernet 1000000 #define __NR_syz_extract_tcp_res 1000001 #define __NR_syz_fuse_mount 1000002 @@ -3036,7 +3036,7 @@ call_t syscalls[] = { #if defined(__arm__) || 0 #define GOARCH "arm" -#define SYZ_REVISION "8af0eb5972040d154dfc38d5f3d39c073da34609" +#define SYZ_REVISION "4ef4f4608f3695cbc0b125497ca2e00ac8cf976e" #define __NR_syz_emit_ethernet 1000000 #define __NR_syz_extract_tcp_res 1000001 #define __NR_syz_fuse_mount 1000002 @@ -4533,7 +4533,7 @@ call_t syscalls[] = { #if defined(__aarch64__) || 0 #define GOARCH "arm64" -#define SYZ_REVISION "da2e426acf7b54f32af3dab8f6f967d5da8109dc" +#define SYZ_REVISION "3d2bd792c348a3a3567894172f563508424fa0a8" #define __NR_syz_emit_ethernet 1000000 #define __NR_syz_extract_tcp_res 1000001 #define __NR_syz_fuse_mount 1000002 @@ -6009,7 +6009,7 @@ call_t syscalls[] = { #if defined(__ppc64__) || defined(__PPC64__) || defined(__powerpc64__) || 0 #define GOARCH "ppc64le" -#define SYZ_REVISION "80fceb3ff839c42150363f99649c2cd07e0ab5fd" +#define SYZ_REVISION "221c46502080a92564e356e1f2169553ba2e4089" #define __NR_syz_emit_ethernet 1000000 #define __NR_syz_extract_tcp_res 1000001 #define __NR_syz_fuse_mount 1000002 diff --git a/executor/syscalls_test.h b/executor/syscalls_test.h index 9dc11ffe..19a8c2fc 100644 --- a/executor/syscalls_test.h +++ b/executor/syscalls_test.h @@ -2,10 +2,10 @@ #if 0 #define GOARCH "32" -#define SYZ_REVISION "cedc2016e286bbf40c6139517be44a4da4597d76" +#define SYZ_REVISION "bdaa89c6378138891b16bdae7dc50da273a1fa6f" #define __NR_syz_test 1000000 -unsigned syscall_count = 79; +unsigned syscall_count = 81; call_t syscalls[] = { {"mmap", 0, (syscall_t)mmap}, {"mutate0", 0, (syscall_t)mutate0}, @@ -16,6 +16,7 @@ call_t syscalls[] = { {"mutate5", 0, (syscall_t)mutate5}, {"mutate6", 0, (syscall_t)mutate6}, {"mutate7", 0, (syscall_t)mutate7}, + {"mutate8", 0, (syscall_t)mutate8}, {"serialize0", 0, (syscall_t)serialize0}, {"serialize1", 0, (syscall_t)serialize1}, {"syz_test", 1000000, (syscall_t)syz_test}, @@ -69,6 +70,7 @@ call_t syscalls[] = { {"syz_test$opt0", 1000000, (syscall_t)syz_test}, {"syz_test$opt1", 1000000, (syscall_t)syz_test}, {"syz_test$opt2", 1000000, (syscall_t)syz_test}, + {"syz_test$opt3", 1000000, (syscall_t)syz_test}, {"syz_test$recur0", 1000000, (syscall_t)syz_test}, {"syz_test$recur1", 1000000, (syscall_t)syz_test}, {"syz_test$recur2", 1000000, (syscall_t)syz_test}, @@ -92,10 +94,10 @@ call_t syscalls[] = { #if 0 #define GOARCH "64" -#define SYZ_REVISION "ffa97db9c46ed8fe481729806726c7dc313618e2" +#define SYZ_REVISION "1a34f1204c41f7e31560335cd00119045c30dd16" #define __NR_syz_test 1000000 -unsigned syscall_count = 79; +unsigned syscall_count = 81; call_t syscalls[] = { {"mmap", 0, (syscall_t)mmap}, {"mutate0", 0, (syscall_t)mutate0}, @@ -106,6 +108,7 @@ call_t syscalls[] = { {"mutate5", 0, (syscall_t)mutate5}, {"mutate6", 0, (syscall_t)mutate6}, {"mutate7", 0, (syscall_t)mutate7}, + {"mutate8", 0, (syscall_t)mutate8}, {"serialize0", 0, (syscall_t)serialize0}, {"serialize1", 0, (syscall_t)serialize1}, {"syz_test", 1000000, (syscall_t)syz_test}, @@ -159,6 +162,7 @@ call_t syscalls[] = { {"syz_test$opt0", 1000000, (syscall_t)syz_test}, {"syz_test$opt1", 1000000, (syscall_t)syz_test}, {"syz_test$opt2", 1000000, (syscall_t)syz_test}, + {"syz_test$opt3", 1000000, (syscall_t)syz_test}, {"syz_test$recur0", 1000000, (syscall_t)syz_test}, {"syz_test$recur1", 1000000, (syscall_t)syz_test}, {"syz_test$recur2", 1000000, (syscall_t)syz_test}, diff --git a/pkg/compiler/testdata/errors.txt b/pkg/compiler/testdata/errors.txt index de131fc5..ade8c624 100644 --- a/pkg/compiler/testdata/errors.txt +++ b/pkg/compiler/testdata/errors.txt @@ -114,6 +114,7 @@ foo$49(a ptr[in, array[int32, 0:1]]) foo$50(a ptr[in, array[int32, 0]]) ### arrays of size 0 are not supported foo$51(a ptr[in, array[int32, 0:0]]) ### arrays of size 0 are not supported foo$52(a intptr, b bitsize[a]) +foo$53(a proc[20, 10, opt]) opt { ### struct uses reserved name opt f1 int32 diff --git a/pkg/compiler/types.go b/pkg/compiler/types.go index 227b8b4c..30d3dac6 100644 --- a/pkg/compiler/types.go +++ b/pkg/compiler/types.go @@ -334,11 +334,10 @@ func genCsumKind(t *ast.Type) prog.CsumKind { } var typeProc = &typeDesc{ - Names: []string{"proc"}, - CanBeArg: true, - CantBeOpt: true, - NeedBase: true, - Args: []namedArg{{"range start", typeArgInt}, {"per-proc values", typeArgInt}}, + Names: []string{"proc"}, + CanBeArg: true, + NeedBase: true, + Args: []namedArg{{"range start", typeArgInt}, {"per-proc values", typeArgInt}}, Check: func(comp *compiler, t *ast.Type, args []*ast.Type, base prog.IntTypeCommon) { start := args[0].Value perProc := args[1].Value diff --git a/prog/encodingexec_test.go b/prog/encodingexec_test.go index 5c2c1853..06265fa7 100644 --- a/prog/encodingexec_test.go +++ b/prog/encodingexec_test.go @@ -364,6 +364,23 @@ func TestSerializeForExec(t *testing.T) { }, nil, }, + { + "syz_test$opt3(0x0)", + []uint64{ + callID("syz_test$opt3"), ExecNoCopyout, 1, execArgConst, 8 | 4<<32, 0x64, + execInstrEOF, + }, + nil, + }, + { + // Special value that translates to 0 for all procs. + "syz_test$opt3(0xffffffffffffffff)", + []uint64{ + callID("syz_test$opt3"), ExecNoCopyout, 1, execArgConst, 8, 0, + execInstrEOF, + }, + nil, + }, } buf := make([]byte, ExecBufferSize) diff --git a/prog/mutation_test.go b/prog/mutation_test.go index 21f0261d..97490a07 100644 --- a/prog/mutation_test.go +++ b/prog/mutation_test.go @@ -142,6 +142,12 @@ mutate3(&(0x7f0000000000)=[0x1, 0x1, 0x1], 0x3) mutate7(&(0x7f0000000000)='123', 0x3) `, ` mutate7(&(0x7f0000000000)='123', 0x2) +`}, + // Mutate proc to the special value. + {` +mutate8(0x2) +`, ` +mutate8(0xffffffffffffffff) `}, } for ti, test := range tests { diff --git a/prog/prog.go b/prog/prog.go index 4a612d9b..a323bafa 100644 --- a/prog/prog.go +++ b/prog/prog.go @@ -81,6 +81,9 @@ func (arg *ConstArg) Value() (uint64, uint64, bool) { t := typ.Desc.Type.(*IntType) return arg.Val, 0, t.BigEndian case *ProcType: + if arg.Val == typ.Default() { + return 0, 0, false + } return typ.ValuesStart + arg.Val, typ.ValuesPerProc, typ.BigEndian default: panic(fmt.Sprintf("unknown ConstArg type %#v", typ)) diff --git a/prog/types.go b/prog/types.go index 16e8421f..5ed3a41b 100644 --- a/prog/types.go +++ b/prog/types.go @@ -173,6 +173,11 @@ type ProcType struct { ValuesPerProc uint64 } +func (t *ProcType) Default() uint64 { + // Special value denoting 0 for all procs. + return 0xffffffffffffffff +} + type CsumKind int const ( diff --git a/prog/validation.go b/prog/validation.go index 288a8172..2b0fb984 100644 --- a/prog/validation.go +++ b/prog/validation.go @@ -112,7 +112,7 @@ func (c *Call) validate(ctx *validCtx) error { case *ProcType: switch a := arg.(type) { case *ConstArg: - if a.Val >= typ1.ValuesPerProc { + if a.Val >= typ1.ValuesPerProc && a.Val != typ1.Default() { return fmt.Errorf("syscall %v: per proc arg '%v' has bad value '%v'", c.Meta.Name, a.Type().Name(), a.Val) } default: diff --git a/sys/linux/386.go b/sys/linux/386.go index 160d2496..e4fb9f49 100644 --- a/sys/linux/386.go +++ b/sys/linux/386.go @@ -4056,7 +4056,7 @@ var structDescs_386 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "sadb_x_policy_type", TypeSize: 2}}, Kind: 2, RangeEnd: 4}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipsec_policy_dir", FldName: "sadb_x_policy_dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_policy_reserved", TypeSize: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "sadb_x_policy_priority", TypeSize: 4}}}, &StructType{Key: StructKey{Name: "sadb_x_ipsecrequest"}, FldName: "policy"}, }, AlignAttr: 8}}, @@ -4067,7 +4067,7 @@ var structDescs_386 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved1", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved2", TypeSize: 2}}}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_sequence", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }, AlignAttr: 8}}, {Key: StructKey{Name: "sadb_x_sec_ctx"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sadb_x_sec_ctx"}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize8", FldName: "sadb_len", TypeSize: 2}}, BitSize: 64, Buf: "parent"}, @@ -5963,7 +5963,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_usersa_id"}, FldName: "sa_id"}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }}}, {Key: StructKey{Name: "xfrm_algo_aead"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_aead"}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_aead_name"}, FldName: "alg_name"}, @@ -6408,7 +6408,7 @@ var structDescs_386 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv6_types", FldName: "proto", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 0, 43, 44, 58, 59, 60, 135, 0, 43, 44, 47, 50, 51, 58, 59, 60, 135}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "mode", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved", TypeSize: 2}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "old_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "new_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, }}}, @@ -6438,7 +6438,7 @@ var structDescs_386 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1}}}, @@ -6452,7 +6452,7 @@ var structDescs_386 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address", Dir: 1}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1, ArgDir: 1}}}, @@ -6463,7 +6463,7 @@ var structDescs_386 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "xfrm_userpolicy_id"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_userpolicy_id", TypeSize: 64}, Fields: []Type{ &StructType{Key: StructKey{Name: "xfrm_selector"}, FldName: "sel"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }}}, @@ -6472,7 +6472,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg"}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1}}, Vals: []uint64{0, 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, @@ -6484,7 +6484,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg", Dir: 1}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur", Dir: 1}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4, ArgDir: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{1, 2}}, @@ -6516,7 +6516,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &StructType{Key: StructKey{Name: "xfrm_stats"}, FldName: "stats"}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "seq", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "replay_window", TypeSize: 1}}}, @@ -17920,4 +17920,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "a422d870ebcb6d4c7a0bc930660401fa661e5a6e" +const revision_386 = "61a1470bb1a43c7bd36f95380a36757f8965dd69" diff --git a/sys/linux/amd64.go b/sys/linux/amd64.go index 420a1a09..1fbf9d0e 100644 --- a/sys/linux/amd64.go +++ b/sys/linux/amd64.go @@ -4154,7 +4154,7 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "sadb_x_policy_type", TypeSize: 2}}, Kind: 2, RangeEnd: 4}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipsec_policy_dir", FldName: "sadb_x_policy_dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_policy_reserved", TypeSize: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "sadb_x_policy_priority", TypeSize: 4}}}, &StructType{Key: StructKey{Name: "sadb_x_ipsecrequest"}, FldName: "policy"}, }, AlignAttr: 8}}, @@ -4165,7 +4165,7 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved1", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved2", TypeSize: 2}}}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_sequence", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }, AlignAttr: 8}}, {Key: StructKey{Name: "sadb_x_sec_ctx"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sadb_x_sec_ctx"}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize8", FldName: "sadb_len", TypeSize: 2}}, BitSize: 64, Buf: "parent"}, @@ -6151,7 +6151,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_usersa_id"}, FldName: "sa_id"}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }}}, {Key: StructKey{Name: "xfrm_algo_aead"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_aead"}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_aead_name"}, FldName: "alg_name"}, @@ -6596,7 +6596,7 @@ var structDescs_amd64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv6_types", FldName: "proto", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 0, 43, 44, 58, 59, 60, 135, 0, 43, 44, 47, 50, 51, 58, 59, 60, 135}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "mode", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved", TypeSize: 2}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "old_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "new_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, }}}, @@ -6626,7 +6626,7 @@ var structDescs_amd64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1}}}, @@ -6640,7 +6640,7 @@ var structDescs_amd64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address", Dir: 1}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1, ArgDir: 1}}}, @@ -6651,7 +6651,7 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "xfrm_userpolicy_id"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_userpolicy_id", TypeSize: 64}, Fields: []Type{ &StructType{Key: StructKey{Name: "xfrm_selector"}, FldName: "sel"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }}}, @@ -6660,7 +6660,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg"}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1}}, Vals: []uint64{0, 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, @@ -6672,7 +6672,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg", Dir: 1}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur", Dir: 1}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4, ArgDir: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{1, 2}}, @@ -6704,7 +6704,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &StructType{Key: StructKey{Name: "xfrm_stats"}, FldName: "stats"}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "seq", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "replay_window", TypeSize: 1}}}, @@ -18449,4 +18449,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "30a3d7b3bf83f83a7b8d55ee7989ada3383f37f2" +const revision_amd64 = "321f7567e5ebda4b1d2b170d83c76869d62b8b36" diff --git a/sys/linux/arm.go b/sys/linux/arm.go index eb57d744..adfc0f23 100644 --- a/sys/linux/arm.go +++ b/sys/linux/arm.go @@ -3899,7 +3899,7 @@ var structDescs_arm = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "sadb_x_policy_type", TypeSize: 2}}, Kind: 2, RangeEnd: 4}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipsec_policy_dir", FldName: "sadb_x_policy_dir", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_policy_reserved", TypeSize: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "sadb_x_policy_priority", TypeSize: 4}}}, &StructType{Key: StructKey{Name: "sadb_x_ipsecrequest"}, FldName: "policy"}, }, AlignAttr: 8}}, @@ -3910,7 +3910,7 @@ var structDescs_arm = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved1", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved2", TypeSize: 2}}}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_sequence", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }, AlignAttr: 8}}, {Key: StructKey{Name: "sadb_x_sec_ctx"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sadb_x_sec_ctx"}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize8", FldName: "sadb_len", TypeSize: 2}}, BitSize: 64, Buf: "parent"}, @@ -5812,7 +5812,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_usersa_id"}, FldName: "sa_id"}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }}}, {Key: StructKey{Name: "xfrm_algo_aead"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_aead"}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_aead_name"}, FldName: "alg_name"}, @@ -6257,7 +6257,7 @@ var structDescs_arm = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv6_types", FldName: "proto", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 0, 43, 44, 58, 59, 60, 135, 0, 43, 44, 47, 50, 51, 58, 59, 60, 135}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "mode", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved", TypeSize: 2}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "old_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "new_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, }}}, @@ -6287,7 +6287,7 @@ var structDescs_arm = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1}}}, @@ -6301,7 +6301,7 @@ var structDescs_arm = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address", Dir: 1}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1, ArgDir: 1}}}, @@ -6312,7 +6312,7 @@ var structDescs_arm = []*KeyedStruct{ }}}, {Key: StructKey{Name: "xfrm_userpolicy_id"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_userpolicy_id", TypeSize: 64}, Fields: []Type{ &StructType{Key: StructKey{Name: "xfrm_selector"}, FldName: "sel"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }}}, @@ -6321,7 +6321,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg"}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1}}, Vals: []uint64{0, 1}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1}}}, @@ -6333,7 +6333,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg", Dir: 1}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur", Dir: 1}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4, ArgDir: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1, ArgDir: 1}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1, ArgDir: 1}}}, @@ -6365,7 +6365,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &StructType{Key: StructKey{Name: "xfrm_stats"}, FldName: "stats"}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "seq", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "replay_window", TypeSize: 1}}}, @@ -17717,4 +17717,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "8af0eb5972040d154dfc38d5f3d39c073da34609" +const revision_arm = "4ef4f4608f3695cbc0b125497ca2e00ac8cf976e" diff --git a/sys/linux/arm64.go b/sys/linux/arm64.go index c0ea8fbc..374c63b3 100644 --- a/sys/linux/arm64.go +++ b/sys/linux/arm64.go @@ -3959,7 +3959,7 @@ var structDescs_arm64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "sadb_x_policy_type", TypeSize: 2}}, Kind: 2, RangeEnd: 4}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipsec_policy_dir", FldName: "sadb_x_policy_dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_policy_reserved", TypeSize: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "sadb_x_policy_priority", TypeSize: 4}}}, &StructType{Key: StructKey{Name: "sadb_x_ipsecrequest"}, FldName: "policy"}, }, AlignAttr: 8}}, @@ -3970,7 +3970,7 @@ var structDescs_arm64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved1", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved2", TypeSize: 2}}}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_sequence", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }, AlignAttr: 8}}, {Key: StructKey{Name: "sadb_x_sec_ctx"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sadb_x_sec_ctx"}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize8", FldName: "sadb_len", TypeSize: 2}}, BitSize: 64, Buf: "parent"}, @@ -5927,7 +5927,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_usersa_id"}, FldName: "sa_id"}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }}}, {Key: StructKey{Name: "xfrm_algo_aead"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_aead"}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_aead_name"}, FldName: "alg_name"}, @@ -6372,7 +6372,7 @@ var structDescs_arm64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv6_types", FldName: "proto", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 0, 43, 44, 58, 59, 60, 135, 0, 43, 44, 47, 50, 51, 58, 59, 60, 135}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "mode", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved", TypeSize: 2}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "old_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "new_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, }}}, @@ -6402,7 +6402,7 @@ var structDescs_arm64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1}}}, @@ -6416,7 +6416,7 @@ var structDescs_arm64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address", Dir: 1}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1, ArgDir: 1}}}, @@ -6427,7 +6427,7 @@ var structDescs_arm64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "xfrm_userpolicy_id"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_userpolicy_id", TypeSize: 64}, Fields: []Type{ &StructType{Key: StructKey{Name: "xfrm_selector"}, FldName: "sel"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }}}, @@ -6436,7 +6436,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg"}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1}}, Vals: []uint64{0, 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, @@ -6448,7 +6448,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg", Dir: 1}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur", Dir: 1}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4, ArgDir: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{1, 2}}, @@ -6480,7 +6480,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &StructType{Key: StructKey{Name: "xfrm_stats"}, FldName: "stats"}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "seq", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "replay_window", TypeSize: 1}}}, @@ -17831,4 +17831,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "da2e426acf7b54f32af3dab8f6f967d5da8109dc" +const revision_arm64 = "3d2bd792c348a3a3567894172f563508424fa0a8" diff --git a/sys/linux/ppc64le.go b/sys/linux/ppc64le.go index fe44a7b4..3e8b0f07 100644 --- a/sys/linux/ppc64le.go +++ b/sys/linux/ppc64le.go @@ -3891,7 +3891,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "sadb_x_policy_type", TypeSize: 2}}, Kind: 2, RangeEnd: 4}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipsec_policy_dir", FldName: "sadb_x_policy_dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_policy_reserved", TypeSize: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_policy_id", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "sadb_x_policy_priority", TypeSize: 4}}}, &StructType{Key: StructKey{Name: "sadb_x_ipsecrequest"}, FldName: "policy"}, }, AlignAttr: 8}}, @@ -3902,7 +3902,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved1", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "sadb_x_sa2_reserved2", TypeSize: 2}}}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_sequence", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "sadb_x_sa2_reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }, AlignAttr: 8}}, {Key: StructKey{Name: "sadb_x_sec_ctx"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sadb_x_sec_ctx"}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize8", FldName: "sadb_len", TypeSize: 2}}, BitSize: 64, Buf: "parent"}, @@ -5772,7 +5772,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_usersa_id"}, FldName: "sa_id"}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "flags", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, }}}, {Key: StructKey{Name: "xfrm_algo_aead"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_aead"}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_aead_name"}, FldName: "alg_name"}, @@ -6217,7 +6217,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv6_types", FldName: "proto", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 0, 43, 44, 58, 59, 60, 135, 0, 43, 44, 47, 50, 51, 58, 59, 60, 135}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "mode", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved", TypeSize: 2}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "old_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "new_family", TypeSize: 2}}, Vals: []uint64{2, 10}}, }}}, @@ -6247,7 +6247,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address"}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1}}}, @@ -6261,7 +6261,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2, ArgDir: 1}}, Vals: []uint64{2, 10}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &UnionType{Key: StructKey{Name: "xfrm_address", Dir: 1}, FldName: "saddr"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_shares", FldName: "share", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2, 3}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "optional", TypeSize: 1, ArgDir: 1}}}, @@ -6272,7 +6272,7 @@ var structDescs_ppc64le = []*KeyedStruct{ }}}, {Key: StructKey{Name: "xfrm_userpolicy_id"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_userpolicy_id", TypeSize: 64}, Fields: []Type{ &StructType{Key: StructKey{Name: "xfrm_selector"}, FldName: "sel"}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }}}, @@ -6281,7 +6281,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg"}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1}}, Vals: []uint64{0, 1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1}}, Vals: []uint64{0, 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1}}, Vals: []uint64{1, 2}}, @@ -6293,7 +6293,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cfg", Dir: 1}, FldName: "lft"}, &StructType{Key: StructKey{Name: "xfrm_lifetime_cur", Dir: 1}, FldName: "curlft"}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "priority", TypeSize: 4, ArgDir: 1}}}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1}}, ValuesStart: 7236528, ValuesPerProc: 16}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "index", TypeSize: 4, ArgDir: 1, IsOptional: true}}, ValuesStart: 7236528, ValuesPerProc: 16}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_dir", FldName: "dir", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1, 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_actions", FldName: "action", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{0, 1}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_policy_flags", FldName: "flags", TypeSize: 1, ArgDir: 1}}, Vals: []uint64{1, 2}}, @@ -6325,7 +6325,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xfrm_lifetime_cur"}, FldName: "curlft"}, &StructType{Key: StructKey{Name: "xfrm_stats"}, FldName: "stats"}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "seq", TypeSize: 4}}, ValuesStart: 7388453, ValuesPerProc: 8}, - &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4}}, ValuesStart: 13567, ValuesPerProc: 8}, + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "reqid", TypeSize: 4, IsOptional: true}}, ValuesStart: 13567, ValuesPerProc: 8}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_family", FldName: "family", TypeSize: 2}}, Vals: []uint64{2, 10}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_mode", FldName: "mode", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "replay_window", TypeSize: 1}}}, @@ -17512,4 +17512,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "80fceb3ff839c42150363f99649c2cd07e0ab5fd" +const revision_ppc64le = "221c46502080a92564e356e1f2169553ba2e4089" diff --git a/sys/linux/socket_key.txt b/sys/linux/socket_key.txt index 3afeca88..942ce9ea 100644 --- a/sys/linux/socket_key.txt +++ b/sys/linux/socket_key.txt @@ -126,7 +126,7 @@ sadb_x_policy { sadb_x_policy_type int16[IPSEC_POLICY_DISCARD:IPSEC_POLICY_BYPASS] sadb_x_policy_dir flags[ipsec_policy_dir, int8] sadb_x_policy_reserved const[0, int8] - sadb_x_policy_id proc[7236528, 16, int32] + sadb_x_policy_id proc[7236528, 16, int32, opt] sadb_x_policy_priority int32 policy sadb_x_ipsecrequest } [packed, align_8] @@ -150,7 +150,7 @@ sadb_x_sa2 { sadb_x_sa2_reserved1 const[0, int8] sadb_x_sa2_reserved2 const[0, int16] sadb_x_sa2_sequence proc[7388453, 8, int32] - sadb_x_sa2_reqid proc[13567, 8, int32] + sadb_x_sa2_reqid proc[13567, 8, int32, opt] } [packed, align_8] sadb_x_nat_t_type { diff --git a/sys/linux/socket_netlink_xfrm.txt b/sys/linux/socket_netlink_xfrm.txt index 8e232cce..48a9a116 100644 --- a/sys/linux/socket_netlink_xfrm.txt +++ b/sys/linux/socket_netlink_xfrm.txt @@ -9,10 +9,6 @@ include include include -# TODO: policy id/index and reqid proc types must be marked as opt, -# because 0 is good valid value as well (here and in socket_key.txt). -# However, this is currently not supported. - resource sock_nl_xfrm[sock_netlink] socket$nl_xfrm(domain const[AF_NETLINK], type const[SOCK_RAW], proto const[NETLINK_XFRM]) sock_nl_xfrm @@ -71,7 +67,7 @@ xfrm_usersa_info { curlft xfrm_lifetime_cur stats xfrm_stats seq proc[7388453, 8, int32] - reqid proc[13567, 8, int32] + reqid proc[13567, 8, int32, opt] family flags[xfrm_family, int16] mode flags[xfrm_mode, int8] replay_window int8 @@ -123,7 +119,7 @@ xfrm_delpolicy_msgs = XFRM_MSG_DELPOLICY, XFRM_MSG_GETPOLICY, XFRM_MSG_MIGRATE xfrm_userpolicy_id { sel xfrm_selector - index proc[7236528, 16, int32] + index proc[7236528, 16, int32, opt] dir flags[xfrm_policy_dir, int8] } @@ -248,7 +244,7 @@ xfrm_aevent_id { sa_id xfrm_usersa_id saddr xfrm_address flags int32 - reqid proc[13567, 8, int32] + reqid proc[13567, 8, int32, opt] } xfrm_getsadinfo { @@ -472,7 +468,7 @@ xfrm_user_migrate { proto flags[ipv6_types, int8] mode int8 reserved const[0, int16] - reqid proc[13567, 8, int32] + reqid proc[13567, 8, int32, opt] old_family flags[xfrm_family, int16] new_family flags[xfrm_family, int16] } @@ -639,7 +635,7 @@ xfrm_userpolicy_info { lft xfrm_lifetime_cfg curlft xfrm_lifetime_cur priority int32 - index proc[7236528, 16, int32] + index proc[7236528, 16, int32, opt] dir flags[xfrm_policy_dir, int8] action flags[xfrm_policy_actions, int8] flags flags[xfrm_policy_flags, int8] @@ -650,7 +646,7 @@ xfrm_user_tmpl { id xfrm_id family flags[xfrm_family, int16] saddr xfrm_address - reqid proc[13567, 8, int32] + reqid proc[13567, 8, int32, opt] mode flags[xfrm_mode, int8] share flags[xfrm_policy_shares, int8] optional int8 diff --git a/sys/test/32.go b/sys/test/32.go index f436410a..8d1d60df 100644 --- a/sys/test/32.go +++ b/sys/test/32.go @@ -408,228 +408,234 @@ var syscalls_32 = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string"}, Kind: 2}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, }}, - {ID: 9, Name: "serialize0", CallName: "serialize0", Args: []Type{ + {ID: 9, Name: "mutate8", CallName: "mutate8", Args: []Type{ + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "a0", TypeSize: 4, IsOptional: true}}, ValuesStart: 100, ValuesPerProc: 4}, + }}, + {ID: 10, Name: "serialize0", CallName: "serialize0", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "serialize0_struct"}}}, }}, - {ID: 10, Name: "serialize1", CallName: "serialize1", Args: []Type{ + {ID: 11, Name: "serialize1", CallName: "serialize1", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "b", TypeSize: 4}}, Buf: "a"}, }}, - {ID: 11, NR: 1000000, Name: "syz_test", CallName: "syz_test"}, - {ID: 12, NR: 1000000, Name: "syz_test$align0", CallName: "syz_test", Args: []Type{ + {ID: 12, NR: 1000000, Name: "syz_test", CallName: "syz_test"}, + {ID: 13, NR: 1000000, Name: "syz_test$align0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_align0"}}}, }}, - {ID: 13, NR: 1000000, Name: "syz_test$align1", CallName: "syz_test", Args: []Type{ + {ID: 14, NR: 1000000, Name: "syz_test$align1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_align1"}}}, }}, - {ID: 14, NR: 1000000, Name: "syz_test$align2", CallName: "syz_test", Args: []Type{ + {ID: 15, NR: 1000000, Name: "syz_test$align2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_align2"}}}, }}, - {ID: 15, NR: 1000000, Name: "syz_test$align3", CallName: "syz_test", Args: []Type{ + {ID: 16, NR: 1000000, Name: "syz_test$align3", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_align3"}}}, }}, - {ID: 16, NR: 1000000, Name: "syz_test$align4", CallName: "syz_test", Args: []Type{ + {ID: 17, NR: 1000000, Name: "syz_test$align4", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_align4"}}}, }}, - {ID: 17, NR: 1000000, Name: "syz_test$align5", CallName: "syz_test", Args: []Type{ + {ID: 18, NR: 1000000, Name: "syz_test$align5", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_align5"}}}, }}, - {ID: 18, NR: 1000000, Name: "syz_test$align6", CallName: "syz_test", Args: []Type{ + {ID: 19, NR: 1000000, Name: "syz_test$align6", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_align6"}}}, }}, - {ID: 19, NR: 1000000, Name: "syz_test$array0", CallName: "syz_test", Args: []Type{ + {ID: 20, NR: 1000000, Name: "syz_test$array0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_array_struct"}}}, }}, - {ID: 20, NR: 1000000, Name: "syz_test$array1", CallName: "syz_test", Args: []Type{ + {ID: 21, NR: 1000000, Name: "syz_test$array1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_array_trailing"}}}, }}, - {ID: 21, NR: 1000000, Name: "syz_test$array2", CallName: "syz_test", Args: []Type{ + {ID: 22, NR: 1000000, Name: "syz_test$array2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_array_blob"}}}, }}, - {ID: 22, NR: 1000000, Name: "syz_test$bf0", CallName: "syz_test", Args: []Type{ + {ID: 23, NR: 1000000, Name: "syz_test$bf0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_bf_struct0"}}}, }}, - {ID: 23, NR: 1000000, Name: "syz_test$bf1", CallName: "syz_test", Args: []Type{ + {ID: 24, NR: 1000000, Name: "syz_test$bf1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_bf_struct1"}}}, }}, - {ID: 24, NR: 1000000, Name: "syz_test$csum_encode", CallName: "syz_test", Args: []Type{ + {ID: 25, NR: 1000000, Name: "syz_test$csum_encode", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_csum_encode"}}}, }}, - {ID: 25, NR: 1000000, Name: "syz_test$csum_ipv4", CallName: "syz_test", Args: []Type{ + {ID: 26, NR: 1000000, Name: "syz_test$csum_ipv4", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv4_header"}}}, }}, - {ID: 26, NR: 1000000, Name: "syz_test$csum_ipv4_tcp", CallName: "syz_test", Args: []Type{ + {ID: 27, NR: 1000000, Name: "syz_test$csum_ipv4_tcp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv4_tcp_packet"}}}, }}, - {ID: 27, NR: 1000000, Name: "syz_test$csum_ipv4_udp", CallName: "syz_test", Args: []Type{ + {ID: 28, NR: 1000000, Name: "syz_test$csum_ipv4_udp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv4_udp_packet"}}}, }}, - {ID: 28, NR: 1000000, Name: "syz_test$csum_ipv6_icmp", CallName: "syz_test", Args: []Type{ + {ID: 29, NR: 1000000, Name: "syz_test$csum_ipv6_icmp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv6_icmp_packet"}}}, }}, - {ID: 29, NR: 1000000, Name: "syz_test$csum_ipv6_tcp", CallName: "syz_test", Args: []Type{ + {ID: 30, NR: 1000000, Name: "syz_test$csum_ipv6_tcp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv6_tcp_packet"}}}, }}, - {ID: 30, NR: 1000000, Name: "syz_test$csum_ipv6_udp", CallName: "syz_test", Args: []Type{ + {ID: 31, NR: 1000000, Name: "syz_test$csum_ipv6_udp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv6_udp_packet"}}}, }}, - {ID: 31, NR: 1000000, Name: "syz_test$end0", CallName: "syz_test", Args: []Type{ + {ID: 32, NR: 1000000, Name: "syz_test$end0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_end_int_struct"}}}, }}, - {ID: 32, NR: 1000000, Name: "syz_test$end1", CallName: "syz_test", Args: []Type{ + {ID: 33, NR: 1000000, Name: "syz_test$end1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_end_var_struct"}}}, }}, - {ID: 33, NR: 1000000, Name: "syz_test$hint_data", CallName: "syz_test", Args: []Type{ + {ID: 34, NR: 1000000, Name: "syz_test$hint_data", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array"}}}, }}, - {ID: 34, NR: 1000000, Name: "syz_test$int", CallName: "syz_test", Args: []Type{ + {ID: 35, NR: 1000000, Name: "syz_test$int", CallName: "syz_test", Args: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "a0", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "a1", TypeSize: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "a2", TypeSize: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "a3", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "a4", TypeSize: 8}}}, }}, - {ID: 35, NR: 1000000, Name: "syz_test$length0", CallName: "syz_test", Args: []Type{ + {ID: 36, NR: 1000000, Name: "syz_test$length0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_int_struct"}}}, }}, - {ID: 36, NR: 1000000, Name: "syz_test$length1", CallName: "syz_test", Args: []Type{ + {ID: 37, NR: 1000000, Name: "syz_test$length1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_const_struct"}}}, }}, - {ID: 37, NR: 1000000, Name: "syz_test$length10", CallName: "syz_test", Args: []Type{ + {ID: 38, NR: 1000000, Name: "syz_test$length10", CallName: "syz_test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "a0", TypeSize: 4}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 4}}, BitSize: 8, Buf: "a0"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize2", FldName: "a3", TypeSize: 4}}, BitSize: 16, Buf: "a0"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize4", FldName: "a4", TypeSize: 4}}, BitSize: 32, Buf: "a0"}, }}, - {ID: 38, NR: 1000000, Name: "syz_test$length11", CallName: "syz_test", Args: []Type{ + {ID: 39, NR: 1000000, Name: "syz_test$length11", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, }}, - {ID: 39, NR: 1000000, Name: "syz_test$length12", CallName: "syz_test", Args: []Type{ + {ID: 40, NR: 1000000, Name: "syz_test$length12", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4, IsOptional: true}, Type: &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, }}, - {ID: 40, NR: 1000000, Name: "syz_test$length13", CallName: "syz_test", Args: []Type{ + {ID: 41, NR: 1000000, Name: "syz_test$length13", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_large_struct", Dir: 2}}}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 4}, Type: &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", TypeSize: 8, ArgDir: 2}}, Buf: "a0"}}, }}, - {ID: 41, NR: 1000000, Name: "syz_test$length14", CallName: "syz_test", Args: []Type{ + {ID: 42, NR: 1000000, Name: "syz_test$length14", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_large_struct", Dir: 2}}}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 4, IsOptional: true}, Type: &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", TypeSize: 8, ArgDir: 2}}, Buf: "a0"}}, }}, - {ID: 42, NR: 1000000, Name: "syz_test$length15", CallName: "syz_test", Args: []Type{ + {ID: 43, NR: 1000000, Name: "syz_test$length15", CallName: "syz_test", Args: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "a0", TypeSize: 2}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, }}, - {ID: 43, NR: 1000000, Name: "syz_test$length16", CallName: "syz_test", Args: []Type{ + {ID: 44, NR: 1000000, Name: "syz_test$length16", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_bytesize_struct"}}}, }}, - {ID: 44, NR: 1000000, Name: "syz_test$length17", CallName: "syz_test", Args: []Type{ + {ID: 45, NR: 1000000, Name: "syz_test$length17", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_bytesize2_struct"}}}, }}, - {ID: 45, NR: 1000000, Name: "syz_test$length18", CallName: "syz_test", Args: []Type{ + {ID: 46, NR: 1000000, Name: "syz_test$length18", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_bytesize3_struct"}}}, }}, - {ID: 46, NR: 1000000, Name: "syz_test$length19", CallName: "syz_test", Args: []Type{ + {ID: 47, NR: 1000000, Name: "syz_test$length19", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_bf_struct"}}}, }}, - {ID: 47, NR: 1000000, Name: "syz_test$length2", CallName: "syz_test", Args: []Type{ + {ID: 48, NR: 1000000, Name: "syz_test$length2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_flags_struct"}}}, }}, - {ID: 48, NR: 1000000, Name: "syz_test$length20", CallName: "syz_test", Args: []Type{ + {ID: 49, NR: 1000000, Name: "syz_test$length20", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_parent2_struct"}}}, }}, - {ID: 49, NR: 1000000, Name: "syz_test$length21", CallName: "syz_test", Args: []Type{ + {ID: 50, NR: 1000000, Name: "syz_test$length21", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8}}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 4}}, BitSize: 1, Buf: "a0"}, }}, - {ID: 50, NR: 1000000, Name: "syz_test$length22", CallName: "syz_test", Args: []Type{ + {ID: 51, NR: 1000000, Name: "syz_test$length22", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array"}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 4}}, BitSize: 1, Buf: "a0"}, }}, - {ID: 51, NR: 1000000, Name: "syz_test$length3", CallName: "syz_test", Args: []Type{ + {ID: 52, NR: 1000000, Name: "syz_test$length3", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_len_struct"}}}, }}, - {ID: 52, NR: 1000000, Name: "syz_test$length4", CallName: "syz_test", Args: []Type{ + {ID: 53, NR: 1000000, Name: "syz_test$length4", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_len2_struct"}}}, }}, - {ID: 53, NR: 1000000, Name: "syz_test$length5", CallName: "syz_test", Args: []Type{ + {ID: 54, NR: 1000000, Name: "syz_test$length5", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_parent_struct"}}}, }}, - {ID: 54, NR: 1000000, Name: "syz_test$length6", CallName: "syz_test", Args: []Type{ + {ID: 55, NR: 1000000, Name: "syz_test$length6", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_array_struct"}}}, }}, - {ID: 55, NR: 1000000, Name: "syz_test$length7", CallName: "syz_test", Args: []Type{ + {ID: 56, NR: 1000000, Name: "syz_test$length7", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_array2_struct"}}}, }}, - {ID: 56, NR: 1000000, Name: "syz_test$length8", CallName: "syz_test", Args: []Type{ + {ID: 57, NR: 1000000, Name: "syz_test$length8", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_complex_struct"}}}, }}, - {ID: 57, NR: 1000000, Name: "syz_test$length9", CallName: "syz_test", Args: []Type{ + {ID: 58, NR: 1000000, Name: "syz_test$length9", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_length_vma_struct"}}}, }}, - {ID: 58, NR: 1000000, Name: "syz_test$missing_resource", CallName: "syz_test", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_missing_const_res", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {ID: 59, NR: 1000000, Name: "syz_test$opt0", CallName: "syz_test", Args: []Type{ + {ID: 59, NR: 1000000, Name: "syz_test$missing_resource", CallName: "syz_test", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_missing_const_res", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {ID: 60, NR: 1000000, Name: "syz_test$opt0", CallName: "syz_test", Args: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "a0", TypeSize: 4, IsOptional: true}}}, }}, - {ID: 60, NR: 1000000, Name: "syz_test$opt1", CallName: "syz_test", Args: []Type{ + {ID: 61, NR: 1000000, Name: "syz_test$opt1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4, IsOptional: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", TypeSize: 4}}}}, }}, - {ID: 61, NR: 1000000, Name: "syz_test$opt2", CallName: "syz_test", Args: []Type{ + {ID: 62, NR: 1000000, Name: "syz_test$opt2", CallName: "syz_test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "a0", TypeSize: 4, IsOptional: true}}, }}, - {ID: 62, NR: 1000000, Name: "syz_test$recur0", CallName: "syz_test", Args: []Type{ + {ID: 63, NR: 1000000, Name: "syz_test$opt3", CallName: "syz_test", Args: []Type{ + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "a0", TypeSize: 4, IsOptional: true}}, ValuesStart: 100, ValuesPerProc: 4}, + }}, + {ID: 64, NR: 1000000, Name: "syz_test$recur0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_recur_0", Dir: 2}}}, }}, - {ID: 63, NR: 1000000, Name: "syz_test$recur1", CallName: "syz_test", Args: []Type{ + {ID: 65, NR: 1000000, Name: "syz_test$recur1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_recur_1", Dir: 2}}}, }}, - {ID: 64, NR: 1000000, Name: "syz_test$recur2", CallName: "syz_test", Args: []Type{ + {ID: 66, NR: 1000000, Name: "syz_test$recur2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_recur_2", Dir: 2}}}, }}, - {ID: 65, NR: 1000000, Name: "syz_test$regression0", CallName: "syz_test", Args: []Type{ + {ID: 67, NR: 1000000, Name: "syz_test$regression0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_regression0_struct", Dir: 2}}}, }}, - {ID: 66, NR: 1000000, Name: "syz_test$regression1", CallName: "syz_test", Args: []Type{ + {ID: 68, NR: 1000000, Name: "syz_test$regression1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 4}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array"}, Type: &StructType{Key: StructKey{Name: "syz_regression1_struct"}}}}, }}, - {ID: 67, NR: 1000000, Name: "syz_test$regression2", CallName: "syz_test", Args: []Type{ + {ID: 69, NR: 1000000, Name: "syz_test$regression2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 4}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array", TypeSize: 16}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: 1, RangeBegin: 4, RangeEnd: 4}}, }}, - {ID: 68, NR: 1000000, Name: "syz_test$res0", CallName: "syz_test", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_res", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {ID: 69, NR: 1000000, Name: "syz_test$res1", CallName: "syz_test", Args: []Type{ + {ID: 70, NR: 1000000, Name: "syz_test$res0", CallName: "syz_test", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_res", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {ID: 71, NR: 1000000, Name: "syz_test$res1", CallName: "syz_test", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_res", FldName: "a0", TypeSize: 4}}, }}, - {ID: 70, NR: 1000000, Name: "syz_test$struct", CallName: "syz_test", Args: []Type{ + {ID: 72, NR: 1000000, Name: "syz_test$struct", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_struct0"}}}, }}, - {ID: 71, NR: 1000000, Name: "syz_test$text_x86_16", CallName: "syz_test", Args: []Type{ + {ID: 73, NR: 1000000, Name: "syz_test$text_x86_16", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "text"}, Kind: 4, Text: 1}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, }}, - {ID: 72, NR: 1000000, Name: "syz_test$text_x86_32", CallName: "syz_test", Args: []Type{ + {ID: 74, NR: 1000000, Name: "syz_test$text_x86_32", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "text"}, Kind: 4, Text: 2}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, }}, - {ID: 73, NR: 1000000, Name: "syz_test$text_x86_64", CallName: "syz_test", Args: []Type{ + {ID: 75, NR: 1000000, Name: "syz_test$text_x86_64", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "text"}, Kind: 4, Text: 3}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, }}, - {ID: 74, NR: 1000000, Name: "syz_test$text_x86_real", CallName: "syz_test", Args: []Type{ + {ID: 76, NR: 1000000, Name: "syz_test$text_x86_real", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "text"}, Kind: 4}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Buf: "a0"}, }}, - {ID: 75, NR: 1000000, Name: "syz_test$union0", CallName: "syz_test", Args: []Type{ + {ID: 77, NR: 1000000, Name: "syz_test$union0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_union0_struct"}}}, }}, - {ID: 76, NR: 1000000, Name: "syz_test$union1", CallName: "syz_test", Args: []Type{ + {ID: 78, NR: 1000000, Name: "syz_test$union1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_union1_struct"}}}, }}, - {ID: 77, NR: 1000000, Name: "syz_test$union2", CallName: "syz_test", Args: []Type{ + {ID: 79, NR: 1000000, Name: "syz_test$union2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "syz_union2_struct"}}}, }}, - {ID: 78, NR: 1000000, Name: "syz_test$vma0", CallName: "syz_test", Args: []Type{ + {ID: 80, NR: 1000000, Name: "syz_test$vma0", CallName: "syz_test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "v0", TypeSize: 4}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 4}}, Buf: "v0"}, &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "v1", TypeSize: 4}, RangeBegin: 5, RangeEnd: 5}, @@ -646,4 +652,4 @@ var consts_32 = []ConstValue{ {Name: "ONLY_32BITS_CONST", Value: 1}, } -const revision_32 = "cedc2016e286bbf40c6139517be44a4da4597d76" +const revision_32 = "bdaa89c6378138891b16bdae7dc50da273a1fa6f" diff --git a/sys/test/64.go b/sys/test/64.go index 345942c9..3e1256fc 100644 --- a/sys/test/64.go +++ b/sys/test/64.go @@ -407,228 +407,234 @@ var syscalls_64 = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string"}, Kind: 2}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, }}, - {ID: 9, Name: "serialize0", CallName: "serialize0", Args: []Type{ + {ID: 9, Name: "mutate8", CallName: "mutate8", Args: []Type{ + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "a0", TypeSize: 8, IsOptional: true}}, ValuesStart: 100, ValuesPerProc: 4}, + }}, + {ID: 10, Name: "serialize0", CallName: "serialize0", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "serialize0_struct"}}}, }}, - {ID: 10, Name: "serialize1", CallName: "serialize1", Args: []Type{ + {ID: 11, Name: "serialize1", CallName: "serialize1", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "b", TypeSize: 8}}, Buf: "a"}, }}, - {ID: 11, NR: 1000000, Name: "syz_test", CallName: "syz_test"}, - {ID: 12, NR: 1000000, Name: "syz_test$align0", CallName: "syz_test", Args: []Type{ + {ID: 12, NR: 1000000, Name: "syz_test", CallName: "syz_test"}, + {ID: 13, NR: 1000000, Name: "syz_test$align0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_align0"}}}, }}, - {ID: 13, NR: 1000000, Name: "syz_test$align1", CallName: "syz_test", Args: []Type{ + {ID: 14, NR: 1000000, Name: "syz_test$align1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_align1"}}}, }}, - {ID: 14, NR: 1000000, Name: "syz_test$align2", CallName: "syz_test", Args: []Type{ + {ID: 15, NR: 1000000, Name: "syz_test$align2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_align2"}}}, }}, - {ID: 15, NR: 1000000, Name: "syz_test$align3", CallName: "syz_test", Args: []Type{ + {ID: 16, NR: 1000000, Name: "syz_test$align3", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_align3"}}}, }}, - {ID: 16, NR: 1000000, Name: "syz_test$align4", CallName: "syz_test", Args: []Type{ + {ID: 17, NR: 1000000, Name: "syz_test$align4", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_align4"}}}, }}, - {ID: 17, NR: 1000000, Name: "syz_test$align5", CallName: "syz_test", Args: []Type{ + {ID: 18, NR: 1000000, Name: "syz_test$align5", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_align5"}}}, }}, - {ID: 18, NR: 1000000, Name: "syz_test$align6", CallName: "syz_test", Args: []Type{ + {ID: 19, NR: 1000000, Name: "syz_test$align6", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_align6"}}}, }}, - {ID: 19, NR: 1000000, Name: "syz_test$array0", CallName: "syz_test", Args: []Type{ + {ID: 20, NR: 1000000, Name: "syz_test$array0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_array_struct"}}}, }}, - {ID: 20, NR: 1000000, Name: "syz_test$array1", CallName: "syz_test", Args: []Type{ + {ID: 21, NR: 1000000, Name: "syz_test$array1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_array_trailing"}}}, }}, - {ID: 21, NR: 1000000, Name: "syz_test$array2", CallName: "syz_test", Args: []Type{ + {ID: 22, NR: 1000000, Name: "syz_test$array2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_array_blob"}}}, }}, - {ID: 22, NR: 1000000, Name: "syz_test$bf0", CallName: "syz_test", Args: []Type{ + {ID: 23, NR: 1000000, Name: "syz_test$bf0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_bf_struct0"}}}, }}, - {ID: 23, NR: 1000000, Name: "syz_test$bf1", CallName: "syz_test", Args: []Type{ + {ID: 24, NR: 1000000, Name: "syz_test$bf1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_bf_struct1"}}}, }}, - {ID: 24, NR: 1000000, Name: "syz_test$csum_encode", CallName: "syz_test", Args: []Type{ + {ID: 25, NR: 1000000, Name: "syz_test$csum_encode", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_csum_encode"}}}, }}, - {ID: 25, NR: 1000000, Name: "syz_test$csum_ipv4", CallName: "syz_test", Args: []Type{ + {ID: 26, NR: 1000000, Name: "syz_test$csum_ipv4", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv4_header"}}}, }}, - {ID: 26, NR: 1000000, Name: "syz_test$csum_ipv4_tcp", CallName: "syz_test", Args: []Type{ + {ID: 27, NR: 1000000, Name: "syz_test$csum_ipv4_tcp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv4_tcp_packet"}}}, }}, - {ID: 27, NR: 1000000, Name: "syz_test$csum_ipv4_udp", CallName: "syz_test", Args: []Type{ + {ID: 28, NR: 1000000, Name: "syz_test$csum_ipv4_udp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv4_udp_packet"}}}, }}, - {ID: 28, NR: 1000000, Name: "syz_test$csum_ipv6_icmp", CallName: "syz_test", Args: []Type{ + {ID: 29, NR: 1000000, Name: "syz_test$csum_ipv6_icmp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv6_icmp_packet"}}}, }}, - {ID: 29, NR: 1000000, Name: "syz_test$csum_ipv6_tcp", CallName: "syz_test", Args: []Type{ + {ID: 30, NR: 1000000, Name: "syz_test$csum_ipv6_tcp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv6_tcp_packet"}}}, }}, - {ID: 30, NR: 1000000, Name: "syz_test$csum_ipv6_udp", CallName: "syz_test", Args: []Type{ + {ID: 31, NR: 1000000, Name: "syz_test$csum_ipv6_udp", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_csum_ipv6_udp_packet"}}}, }}, - {ID: 31, NR: 1000000, Name: "syz_test$end0", CallName: "syz_test", Args: []Type{ + {ID: 32, NR: 1000000, Name: "syz_test$end0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_end_int_struct"}}}, }}, - {ID: 32, NR: 1000000, Name: "syz_test$end1", CallName: "syz_test", Args: []Type{ + {ID: 33, NR: 1000000, Name: "syz_test$end1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_end_var_struct"}}}, }}, - {ID: 33, NR: 1000000, Name: "syz_test$hint_data", CallName: "syz_test", Args: []Type{ + {ID: 34, NR: 1000000, Name: "syz_test$hint_data", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array"}}}, }}, - {ID: 34, NR: 1000000, Name: "syz_test$int", CallName: "syz_test", Args: []Type{ + {ID: 35, NR: 1000000, Name: "syz_test$int", CallName: "syz_test", Args: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "a0", TypeSize: 8}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "a1", TypeSize: 1}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "a2", TypeSize: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "a3", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "a4", TypeSize: 8}}}, }}, - {ID: 35, NR: 1000000, Name: "syz_test$length0", CallName: "syz_test", Args: []Type{ + {ID: 36, NR: 1000000, Name: "syz_test$length0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_int_struct"}}}, }}, - {ID: 36, NR: 1000000, Name: "syz_test$length1", CallName: "syz_test", Args: []Type{ + {ID: 37, NR: 1000000, Name: "syz_test$length1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_const_struct"}}}, }}, - {ID: 37, NR: 1000000, Name: "syz_test$length10", CallName: "syz_test", Args: []Type{ + {ID: 38, NR: 1000000, Name: "syz_test$length10", CallName: "syz_test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "a0", TypeSize: 8}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 8}}, BitSize: 8, Buf: "a0"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize2", FldName: "a3", TypeSize: 8}}, BitSize: 16, Buf: "a0"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize4", FldName: "a4", TypeSize: 8}}, BitSize: 32, Buf: "a0"}, }}, - {ID: 38, NR: 1000000, Name: "syz_test$length11", CallName: "syz_test", Args: []Type{ + {ID: 39, NR: 1000000, Name: "syz_test$length11", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, }}, - {ID: 39, NR: 1000000, Name: "syz_test$length12", CallName: "syz_test", Args: []Type{ + {ID: 40, NR: 1000000, Name: "syz_test$length12", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8, IsOptional: true}, Type: &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, }}, - {ID: 40, NR: 1000000, Name: "syz_test$length13", CallName: "syz_test", Args: []Type{ + {ID: 41, NR: 1000000, Name: "syz_test$length13", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_large_struct", Dir: 2}}}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 8}, Type: &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", TypeSize: 8, ArgDir: 2}}, Buf: "a0"}}, }}, - {ID: 41, NR: 1000000, Name: "syz_test$length14", CallName: "syz_test", Args: []Type{ + {ID: 42, NR: 1000000, Name: "syz_test$length14", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_large_struct", Dir: 2}}}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 8, IsOptional: true}, Type: &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", TypeSize: 8, ArgDir: 2}}, Buf: "a0"}}, }}, - {ID: 42, NR: 1000000, Name: "syz_test$length15", CallName: "syz_test", Args: []Type{ + {ID: 43, NR: 1000000, Name: "syz_test$length15", CallName: "syz_test", Args: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "a0", TypeSize: 2}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, }}, - {ID: 43, NR: 1000000, Name: "syz_test$length16", CallName: "syz_test", Args: []Type{ + {ID: 44, NR: 1000000, Name: "syz_test$length16", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_bytesize_struct"}}}, }}, - {ID: 44, NR: 1000000, Name: "syz_test$length17", CallName: "syz_test", Args: []Type{ + {ID: 45, NR: 1000000, Name: "syz_test$length17", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_bytesize2_struct"}}}, }}, - {ID: 45, NR: 1000000, Name: "syz_test$length18", CallName: "syz_test", Args: []Type{ + {ID: 46, NR: 1000000, Name: "syz_test$length18", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_bytesize3_struct"}}}, }}, - {ID: 46, NR: 1000000, Name: "syz_test$length19", CallName: "syz_test", Args: []Type{ + {ID: 47, NR: 1000000, Name: "syz_test$length19", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_bf_struct"}}}, }}, - {ID: 47, NR: 1000000, Name: "syz_test$length2", CallName: "syz_test", Args: []Type{ + {ID: 48, NR: 1000000, Name: "syz_test$length2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_flags_struct"}}}, }}, - {ID: 48, NR: 1000000, Name: "syz_test$length20", CallName: "syz_test", Args: []Type{ + {ID: 49, NR: 1000000, Name: "syz_test$length20", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_parent2_struct"}}}, }}, - {ID: 49, NR: 1000000, Name: "syz_test$length21", CallName: "syz_test", Args: []Type{ + {ID: 50, NR: 1000000, Name: "syz_test$length21", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8}}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 8}}, BitSize: 1, Buf: "a0"}, }}, - {ID: 50, NR: 1000000, Name: "syz_test$length22", CallName: "syz_test", Args: []Type{ + {ID: 51, NR: 1000000, Name: "syz_test$length22", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array"}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 8}}, BitSize: 1, Buf: "a0"}, }}, - {ID: 51, NR: 1000000, Name: "syz_test$length3", CallName: "syz_test", Args: []Type{ + {ID: 52, NR: 1000000, Name: "syz_test$length3", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_len_struct"}}}, }}, - {ID: 52, NR: 1000000, Name: "syz_test$length4", CallName: "syz_test", Args: []Type{ + {ID: 53, NR: 1000000, Name: "syz_test$length4", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_len2_struct"}}}, }}, - {ID: 53, NR: 1000000, Name: "syz_test$length5", CallName: "syz_test", Args: []Type{ + {ID: 54, NR: 1000000, Name: "syz_test$length5", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_parent_struct"}}}, }}, - {ID: 54, NR: 1000000, Name: "syz_test$length6", CallName: "syz_test", Args: []Type{ + {ID: 55, NR: 1000000, Name: "syz_test$length6", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_array_struct"}}}, }}, - {ID: 55, NR: 1000000, Name: "syz_test$length7", CallName: "syz_test", Args: []Type{ + {ID: 56, NR: 1000000, Name: "syz_test$length7", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_array2_struct"}}}, }}, - {ID: 56, NR: 1000000, Name: "syz_test$length8", CallName: "syz_test", Args: []Type{ + {ID: 57, NR: 1000000, Name: "syz_test$length8", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_complex_struct"}}}, }}, - {ID: 57, NR: 1000000, Name: "syz_test$length9", CallName: "syz_test", Args: []Type{ + {ID: 58, NR: 1000000, Name: "syz_test$length9", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_length_vma_struct"}}}, }}, - {ID: 58, NR: 1000000, Name: "syz_test$missing_resource", CallName: "syz_test", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_missing_const_res", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {ID: 59, NR: 1000000, Name: "syz_test$opt0", CallName: "syz_test", Args: []Type{ + {ID: 59, NR: 1000000, Name: "syz_test$missing_resource", CallName: "syz_test", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_missing_const_res", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {ID: 60, NR: 1000000, Name: "syz_test$opt0", CallName: "syz_test", Args: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "a0", TypeSize: 8, IsOptional: true}}}, }}, - {ID: 60, NR: 1000000, Name: "syz_test$opt1", CallName: "syz_test", Args: []Type{ + {ID: 61, NR: 1000000, Name: "syz_test$opt1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8, IsOptional: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", TypeSize: 8}}}}, }}, - {ID: 61, NR: 1000000, Name: "syz_test$opt2", CallName: "syz_test", Args: []Type{ + {ID: 62, NR: 1000000, Name: "syz_test$opt2", CallName: "syz_test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "a0", TypeSize: 8, IsOptional: true}}, }}, - {ID: 62, NR: 1000000, Name: "syz_test$recur0", CallName: "syz_test", Args: []Type{ + {ID: 63, NR: 1000000, Name: "syz_test$opt3", CallName: "syz_test", Args: []Type{ + &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "a0", TypeSize: 8, IsOptional: true}}, ValuesStart: 100, ValuesPerProc: 4}, + }}, + {ID: 64, NR: 1000000, Name: "syz_test$recur0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_recur_0", Dir: 2}}}, }}, - {ID: 63, NR: 1000000, Name: "syz_test$recur1", CallName: "syz_test", Args: []Type{ + {ID: 65, NR: 1000000, Name: "syz_test$recur1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_recur_1", Dir: 2}}}, }}, - {ID: 64, NR: 1000000, Name: "syz_test$recur2", CallName: "syz_test", Args: []Type{ + {ID: 66, NR: 1000000, Name: "syz_test$recur2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_recur_2", Dir: 2}}}, }}, - {ID: 65, NR: 1000000, Name: "syz_test$regression0", CallName: "syz_test", Args: []Type{ + {ID: 67, NR: 1000000, Name: "syz_test$regression0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_regression0_struct", Dir: 2}}}, }}, - {ID: 66, NR: 1000000, Name: "syz_test$regression1", CallName: "syz_test", Args: []Type{ + {ID: 68, NR: 1000000, Name: "syz_test$regression1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 8}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array"}, Type: &StructType{Key: StructKey{Name: "syz_regression1_struct"}}}}, }}, - {ID: 67, NR: 1000000, Name: "syz_test$regression2", CallName: "syz_test", Args: []Type{ + {ID: 69, NR: 1000000, Name: "syz_test$regression2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 8}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array", TypeSize: 16}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: 1, RangeBegin: 4, RangeEnd: 4}}, }}, - {ID: 68, NR: 1000000, Name: "syz_test$res0", CallName: "syz_test", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_res", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {ID: 69, NR: 1000000, Name: "syz_test$res1", CallName: "syz_test", Args: []Type{ + {ID: 70, NR: 1000000, Name: "syz_test$res0", CallName: "syz_test", Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_res", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {ID: 71, NR: 1000000, Name: "syz_test$res1", CallName: "syz_test", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "syz_res", FldName: "a0", TypeSize: 4}}, }}, - {ID: 70, NR: 1000000, Name: "syz_test$struct", CallName: "syz_test", Args: []Type{ + {ID: 72, NR: 1000000, Name: "syz_test$struct", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_struct0"}}}, }}, - {ID: 71, NR: 1000000, Name: "syz_test$text_x86_16", CallName: "syz_test", Args: []Type{ + {ID: 73, NR: 1000000, Name: "syz_test$text_x86_16", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "text"}, Kind: 4, Text: 1}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, }}, - {ID: 72, NR: 1000000, Name: "syz_test$text_x86_32", CallName: "syz_test", Args: []Type{ + {ID: 74, NR: 1000000, Name: "syz_test$text_x86_32", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "text"}, Kind: 4, Text: 2}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, }}, - {ID: 73, NR: 1000000, Name: "syz_test$text_x86_64", CallName: "syz_test", Args: []Type{ + {ID: 75, NR: 1000000, Name: "syz_test$text_x86_64", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "text"}, Kind: 4, Text: 3}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, }}, - {ID: 74, NR: 1000000, Name: "syz_test$text_x86_real", CallName: "syz_test", Args: []Type{ + {ID: 76, NR: 1000000, Name: "syz_test$text_x86_real", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "text"}, Kind: 4}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Buf: "a0"}, }}, - {ID: 75, NR: 1000000, Name: "syz_test$union0", CallName: "syz_test", Args: []Type{ + {ID: 77, NR: 1000000, Name: "syz_test$union0", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_union0_struct"}}}, }}, - {ID: 76, NR: 1000000, Name: "syz_test$union1", CallName: "syz_test", Args: []Type{ + {ID: 78, NR: 1000000, Name: "syz_test$union1", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_union1_struct"}}}, }}, - {ID: 77, NR: 1000000, Name: "syz_test$union2", CallName: "syz_test", Args: []Type{ + {ID: 79, NR: 1000000, Name: "syz_test$union2", CallName: "syz_test", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "syz_union2_struct"}}}, }}, - {ID: 78, NR: 1000000, Name: "syz_test$vma0", CallName: "syz_test", Args: []Type{ + {ID: 80, NR: 1000000, Name: "syz_test$vma0", CallName: "syz_test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "v0", TypeSize: 8}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 8}}, Buf: "v0"}, &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "v1", TypeSize: 8}, RangeBegin: 5, RangeEnd: 5}, @@ -644,4 +650,4 @@ var consts_64 = []ConstValue{ {Name: "IPPROTO_UDP", Value: 17}, } -const revision_64 = "ffa97db9c46ed8fe481729806726c7dc313618e2" +const revision_64 = "1a34f1204c41f7e31560335cd00119045c30dd16" diff --git a/sys/test/test.txt b/sys/test/test.txt index fcd85f20..f8a1e4fb 100644 --- a/sys/test/test.txt +++ b/sys/test/test.txt @@ -15,6 +15,7 @@ syz_test$int(a0 intptr, a1 int8, a2 int16, a3 int32, a4 int64) syz_test$opt0(a0 intptr[opt]) syz_test$opt1(a0 ptr[in, intptr, opt]) syz_test$opt2(a0 vma[opt]) +syz_test$opt3(a0 proc[100, 4, opt]) # Alignment and padding @@ -556,6 +557,7 @@ mutate4(data ptr[in, array[int8]], size bytesize[data]) mutate5(filename ptr[in, filename], flags flags[open_flags]) fd mutate6(fd fd, data ptr[in, array[int8]], size bytesize[data]) mutate7(a0 ptr[in, string], a1 len[a0]) +mutate8(a0 proc[100, 4, opt]) open_flags = 0xabababababababab, 0xcdcdcdcdcdcdcdcd