From 4fc13fd6ae51fdf3230dde4f31a32feb4861ca37 Mon Sep 17 00:00:00 2001 From: Shankara Pailoor Date: Mon, 12 Nov 2018 04:10:17 -0800 Subject: 1) making bpf_insn varlen, 2) changing bpf_generic to match the struct definition in linux to make trace2syz generation simpler --- sys/linux/gen/amd64.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sys/linux/gen/amd64.go') diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index d714539ac..0fa462ad8 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -788,7 +788,7 @@ var structDescs_amd64 = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 4}}, Buf: "info"}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "info", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "bpf_prog_info", Dir: 1}}}, }}}, - {Key: StructKey{Name: "bpf_insn"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn", TypeSize: 16}, Fields: []Type{ + {Key: StructKey{Name: "bpf_insn"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "bpf_insn_generic"}, FldName: "generic"}, &StructType{Key: StructKey{Name: "bpf_insn_ldst"}, FldName: "ldst"}, &StructType{Key: StructKey{Name: "bpf_insn_alu"}, FldName: "alu"}, @@ -821,7 +821,8 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "bpf_insn_generic"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn_generic", TypeSize: 8}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "code", TypeSize: 1}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "regs", TypeSize: 1}}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "dst", TypeSize: 1}, BitfieldLen: 4, BitfieldMdl: true}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "src", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "off", TypeSize: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "imm", TypeSize: 4}}}, }}}, @@ -42722,4 +42723,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "b8d0f6910233ab190009de819a4853e63f2f4815" +const revision_amd64 = "3568116ea3bce127670798b143ae62fe18332fe8" -- cgit mrf-deployment