From ae5ed0b14052adc4be0d98e5e8a46a0b0ab2c565 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 20 Dec 2019 13:57:42 +0100 Subject: pkg/compiler: fix bitfield layout bug Fixes #1542 Found thanks to syz-check. Update #590 --- sys/linux/gen/amd64.go | 113 +++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 60 deletions(-) (limited to 'sys/linux/gen/amd64.go') diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index a93bf8c85..76c9d2ef1 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -3055,7 +3055,7 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "seq", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "signal", TypeSize: 4}}, Kind: 1, RangeEnd: 65}, }}}, - {Key: StructKey{Name: "dvd_authinfo", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_authinfo", TypeSize: 24, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "dvd_authinfo", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_authinfo", TypeSize: 16, ArgDir: 2}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "dvd_authinfo_type", FldName: "type", TypeSize: 1, ArgDir: 2}}, Vals: []uint64{0, 2, 3, 7, 8, 1, 4, 9, 10, 10}}, &StructType{Key: StructKey{Name: "dvd_lu_send_agid", Dir: 2}, FldName: "lsa"}, &StructType{Key: StructKey{Name: "dvd_host_send_challenge", Dir: 2}, FldName: "hsc"}, @@ -3091,24 +3091,22 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "cpst", TypeSize: 1, ArgDir: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "rmi", TypeSize: 1, ArgDir: 2}}}, }}}, - {Key: StructKey{Name: "dvd_disckey"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_disckey", TypeSize: 2056}, Fields: []Type{ + {Key: StructKey{Name: "dvd_disckey"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_disckey", TypeSize: 2052}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}, Val: 2}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 4}, BitfieldLen: 2, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 1}, BitfieldOff: 8, BitfieldLen: 2, BitfieldUnit: 4, BitfieldUnitOff: 1}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "value", TypeSize: 2048}, Kind: 1, RangeBegin: 2048, RangeEnd: 2048}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "dvd_disckey", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_disckey", TypeSize: 2056, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "dvd_disckey", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_disckey", TypeSize: 2052, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1, ArgDir: 2}}, Val: 2}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 4, ArgDir: 2}, BitfieldLen: 2, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 1, ArgDir: 2}, BitfieldOff: 8, BitfieldLen: 2, BitfieldUnit: 4, BitfieldUnitOff: 1}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "value", TypeSize: 2048, ArgDir: 2}, Kind: 1, RangeBegin: 2048, RangeEnd: 2048}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "dvd_host_send_challenge", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_host_send_challenge", TypeSize: 20, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "dvd_host_send_challenge", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_host_send_challenge", TypeSize: 12, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1, ArgDir: 2}}, Val: 1}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 4, ArgDir: 2}, BitfieldLen: 2, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 1, ArgDir: 2}, BitfieldOff: 8, BitfieldLen: 2, BitfieldUnit: 4, BitfieldUnitOff: 1}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "chal", TypeSize: 10, ArgDir: 2}, Kind: 1, RangeBegin: 10, RangeEnd: 10}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "dvd_host_send_rpcstate", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_host_send_rpcstate", TypeSize: 2, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1, ArgDir: 2}}, Val: 11}, @@ -3124,8 +3122,7 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "nlayers", TypeSize: 1}, BitfieldOff: 5, BitfieldLen: 2, BitfieldUnit: 1}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "track_density"}, BitfieldLen: 4, BitfieldUnit: 1}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "linear_density", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4, BitfieldUnit: 1}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bca", TypeSize: 1}, BitfieldLen: 1, BitfieldUnit: 1}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bca", TypeSize: 4}, BitfieldLen: 1, BitfieldUnit: 1}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "start_sector", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "end_sector", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "end_sector_l0", TypeSize: 4}}}, @@ -3140,29 +3137,26 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "nlayers", TypeSize: 1, ArgDir: 2}, BitfieldOff: 5, BitfieldLen: 2, BitfieldUnit: 1}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "track_density", ArgDir: 2}, BitfieldLen: 4, BitfieldUnit: 1}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "linear_density", TypeSize: 1, ArgDir: 2}, BitfieldOff: 4, BitfieldLen: 4, BitfieldUnit: 1}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bca", TypeSize: 1, ArgDir: 2}, BitfieldLen: 1, BitfieldUnit: 1}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "bca", TypeSize: 4, ArgDir: 2}, BitfieldLen: 1, BitfieldUnit: 1}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "start_sector", TypeSize: 4, ArgDir: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "end_sector", TypeSize: 4, ArgDir: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "end_sector_l0", TypeSize: 4, ArgDir: 2}}}, }}}, - {Key: StructKey{Name: "dvd_lu_send_agid", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_agid", TypeSize: 8, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "dvd_lu_send_agid", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_agid", TypeSize: 4, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1, ArgDir: 2}}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 4, ArgDir: 2}, BitfieldLen: 2, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 1, ArgDir: 2}, BitfieldOff: 8, BitfieldLen: 2, BitfieldUnit: 4, BitfieldUnitOff: 1}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "dvd_lu_send_asf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_asf", TypeSize: 8, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "dvd_lu_send_asf", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_asf", TypeSize: 4, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1, ArgDir: 2}}, Val: 8}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", ArgDir: 2}, BitfieldLen: 2, BitfieldUnit: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "asf", TypeSize: 4, ArgDir: 2}, BitfieldOff: 2, BitfieldLen: 1, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", ArgDir: 2}, BitfieldOff: 8, BitfieldLen: 2, BitfieldUnit: 4, BitfieldUnitOff: 1}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "asf", TypeSize: 1, ArgDir: 2}, BitfieldOff: 10, BitfieldLen: 1, BitfieldUnit: 4, BitfieldUnitOff: 1}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, - {Key: StructKey{Name: "dvd_lu_send_challenge", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_challenge", TypeSize: 20, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "dvd_lu_send_challenge", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_challenge", TypeSize: 12, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1, ArgDir: 2}}, Val: 3}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 4, ArgDir: 2}, BitfieldLen: 2, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 1, ArgDir: 2}, BitfieldOff: 8, BitfieldLen: 2, BitfieldUnit: 4, BitfieldUnitOff: 1}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "chal", TypeSize: 10, ArgDir: 2}, Kind: 1, RangeBegin: 10, RangeEnd: 10}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, }}}, {Key: StructKey{Name: "dvd_lu_send_rpcstate", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_rpcstate", TypeSize: 3, ArgDir: 2}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "type", ArgDir: 2}, BitfieldLen: 2, BitfieldUnit: 1}}, @@ -3171,16 +3165,16 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "region_mask", TypeSize: 1, ArgDir: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "rpc_scheme", TypeSize: 1, ArgDir: 2}}}, }}}, - {Key: StructKey{Name: "dvd_lu_send_title_key", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_title_key", TypeSize: 24, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "dvd_lu_send_title_key", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_lu_send_title_key", TypeSize: 16, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1, ArgDir: 2}}, Val: 7}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 4, ArgDir: 2}, BitfieldLen: 2, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 1, ArgDir: 2}, BitfieldOff: 8, BitfieldLen: 2, BitfieldUnit: 4, BitfieldUnitOff: 1}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "title_key", TypeSize: 5, ArgDir: 2}, Kind: 1, RangeBegin: 5, RangeEnd: 5}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 1}}, IsPad: true}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "lba", TypeSize: 4, ArgDir: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "cpm", ArgDir: 2}, BitfieldLen: 1, BitfieldUnit: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "cp_sec", ArgDir: 2}, BitfieldOff: 1, BitfieldLen: 1, BitfieldUnit: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "cgms", TypeSize: 4, ArgDir: 2}, BitfieldOff: 2, BitfieldLen: 2, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "cgms", TypeSize: 1, ArgDir: 2}, BitfieldOff: 2, BitfieldLen: 2, BitfieldUnit: 4}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }}}, {Key: StructKey{Name: "dvd_manufact"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_manufact", TypeSize: 2056}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}, Val: 4}, @@ -3208,12 +3202,11 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 2}}, IsPad: true}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "layer", TypeSize: 80, ArgDir: 2}, Type: &StructType{Key: StructKey{Name: "dvd_layer", Dir: 2}}, Kind: 1, RangeBegin: 4, RangeEnd: 4}, }}}, - {Key: StructKey{Name: "dvd_send_key", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_send_key", TypeSize: 16, ArgDir: 2}, Fields: []Type{ + {Key: StructKey{Name: "dvd_send_key", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_send_key", TypeSize: 8, ArgDir: 2}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "dvd_send_key_type", FldName: "type", TypeSize: 1, ArgDir: 2}}, Vals: []uint64{2, 4}, BitMask: true}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 4, ArgDir: 2}, BitfieldLen: 2, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "agid", TypeSize: 1, ArgDir: 2}, BitfieldOff: 8, BitfieldLen: 2, BitfieldUnit: 4, BitfieldUnitOff: 1}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "key", TypeSize: 5, ArgDir: 2}, Kind: 1, RangeBegin: 5, RangeEnd: 5}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 1}}, IsPad: true}, }}}, {Key: StructKey{Name: "dvd_struct"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "dvd_struct", TypeSize: 2056}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "dvd_struct_type", FldName: "type", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 4}}, @@ -7126,8 +7119,8 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "R"}, BitfieldOff: 1, BitfieldLen: 1, BitfieldUnit: 2}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "K"}, BitfieldOff: 2, BitfieldLen: 1, BitfieldUnit: 2}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "S"}, BitfieldOff: 3, BitfieldLen: 1, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved"}, BitfieldOff: 4, BitfieldLen: 9, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 2}, BitfieldOff: 13, BitfieldLen: 3, BitfieldUnit: 2}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 9, BitfieldUnit: 2}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 2}, BitfieldOff: 5, BitfieldLen: 3, BitfieldUnit: 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "protocol", TypeSize: 2}, ArgFormat: 1}, Val: 2048}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "add", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", TypeSize: 2}, ArgFormat: 1}}, Kind: 1, RangeEnd: 3}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}}, @@ -7137,8 +7130,8 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "R"}, BitfieldOff: 1, BitfieldLen: 1, BitfieldUnit: 2}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "K"}, BitfieldOff: 2, BitfieldLen: 1, BitfieldUnit: 2}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "S"}, BitfieldOff: 3, BitfieldLen: 1, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved"}, BitfieldOff: 4, BitfieldLen: 9, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 2}, BitfieldOff: 13, BitfieldLen: 3, BitfieldUnit: 2}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 9, BitfieldUnit: 2}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 2}, BitfieldOff: 5, BitfieldLen: 3, BitfieldUnit: 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "protocol", TypeSize: 2}, ArgFormat: 1}, Val: 34525}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "add", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", TypeSize: 2}, ArgFormat: 1}}, Kind: 1, RangeEnd: 3}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}}, @@ -7166,10 +7159,10 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "R"}, BitfieldOff: 1, BitfieldLen: 1, BitfieldUnit: 2}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "K"}, BitfieldOff: 2, BitfieldLen: 1, BitfieldUnit: 2}, Val: 1}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "S"}, BitfieldOff: 3, BitfieldLen: 1, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved"}, BitfieldOff: 4, BitfieldLen: 4, BitfieldUnit: 2}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "A"}, BitfieldOff: 8, BitfieldLen: 1, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "flags"}, BitfieldOff: 9, BitfieldLen: 4, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 2}, BitfieldOff: 13, BitfieldLen: 3, BitfieldUnit: 2}, Val: 1}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4, BitfieldUnit: 2}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "A"}, BitfieldLen: 1, BitfieldUnit: 2}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "flags"}, BitfieldOff: 1, BitfieldLen: 4, BitfieldUnit: 2}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 1}, BitfieldOff: 5, BitfieldLen: 3, BitfieldUnit: 2}, Val: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "protocol", TypeSize: 2}, ArgFormat: 1}, Val: 34827}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "payload_len", TypeSize: 2}, ArgFormat: 1}, BitSize: 8, Path: []string{"payload"}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "key_call_id", TypeSize: 2}, ArgFormat: 1}, Kind: 1, RangeEnd: 3}, @@ -12069,8 +12062,8 @@ var structDescs_amd64 = []*KeyedStruct{ {Key: StructKey{Name: "mptcp_ack_option"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_ack_option", IsVarlen: true}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}, Val: 30}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Path: []string{"parent"}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "reserved"}, BitfieldLen: 12, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "subtype", TypeSize: 2}, BitfieldOff: 12, BitfieldLen: 4, BitfieldUnit: 2}, Val: 4}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "reserved", TypeSize: 1}, BitfieldLen: 12, BitfieldUnit: 2}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "subtype", TypeSize: 2}, BitfieldOff: 4, BitfieldLen: 4, BitfieldUnit: 2}, Val: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "mac", IsVarlen: true}, Kind: 1, RangeEnd: 20}, }}}, {Key: StructKey{Name: "mptcp_add_addr_option"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_add_addr_option", IsVarlen: true}, Fields: []Type{ @@ -12097,11 +12090,11 @@ var structDescs_amd64 = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Path: []string{"parent"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}, Kind: 1, RangeEnd: 16}, }}}, - {Key: StructKey{Name: "mptcp_mp_fclose_option"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_mp_fclose_option", TypeSize: 12}, Fields: []Type{ + {Key: StructKey{Name: "mptcp_mp_fclose_option"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_mp_fclose_option", TypeSize: 13}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}, Val: 30}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "length", TypeSize: 1}}, Path: []string{"parent"}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "reserved"}, BitfieldLen: 12, BitfieldUnit: 2}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "subtype", TypeSize: 2}, BitfieldOff: 12, BitfieldLen: 4, BitfieldUnit: 2}, Val: 128}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "reserved", TypeSize: 1}, BitfieldLen: 12, BitfieldUnit: 2}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "subtype", TypeSize: 2}, BitfieldOff: 4, BitfieldLen: 4, BitfieldUnit: 2}, Val: 128}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "key", TypeSize: 8}}}, }}}, {Key: StructKey{Name: "mptcp_mp_join_option"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "mptcp_mp_join_option", TypeSize: 3}, Fields: []Type{ @@ -23658,8 +23651,7 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "snd_ctl_elem_value"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "snd_ctl_elem_value", TypeSize: 1224}, Fields: []Type{ &StructType{Key: StructKey{Name: "snd_ctl_elem_id"}, FldName: "id"}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "indirect", TypeSize: 4}, BitfieldLen: 1, BitfieldUnit: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "indirect", TypeSize: 8}, BitfieldLen: 1, BitfieldUnit: 4}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "value", TypeSize: 1024}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", TypeSize: 8}}}, Kind: 1, RangeBegin: 128, RangeEnd: 128}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "reserved", TypeSize: 128}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 128, RangeEnd: 128}, }}}, @@ -23809,9 +23801,9 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "buffer_size", TypeSize: 8, ArgDir: 2}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "avail_min", TypeSize: 8, ArgDir: 2}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "no_active_sensing", TypeSize: 4, ArgDir: 2}, BitfieldLen: 1, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "no_active_sensing", TypeSize: 1, ArgDir: 2}, BitfieldLen: 1, BitfieldUnit: 4}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "reserved", TypeSize: 16, ArgDir: 2}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1, ArgDir: 2}}}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 4}}, IsPad: true}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 7}}, IsPad: true}, }}}, {Key: StructKey{Name: "snd_rawmidi_status32", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "snd_rawmidi_status32", TypeSize: 36, ArgDir: 2}, Fields: []Type{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "sndrv_rawmidi_stream", FldName: "stream", TypeSize: 4, ArgDir: 2}}, Vals: []uint64{0, 1}, BitMask: true}, @@ -25909,8 +25901,8 @@ var structDescs_amd64 = []*KeyedStruct{ }}}, {Key: StructKey{Name: "tcf_em_nbyte"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcf_em_nbyte", IsVarlen: true}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "off", TypeSize: 4}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 2}, BitfieldLen: 12, BitfieldUnit: 2}, BitSize: 8, Path: []string{"payload"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "tcf_layers", FldName: "layer", TypeSize: 1}, BitfieldLen: 4, BitfieldUnit: 1}, Vals: []uint64{0, 1, 2}, BitMask: true}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "len", TypeSize: 1}, BitfieldLen: 12, BitfieldUnit: 2}, BitSize: 8, Path: []string{"payload"}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "tcf_layers", FldName: "layer", TypeSize: 2}, BitfieldOff: 4, BitfieldLen: 4, BitfieldUnit: 1}, Vals: []uint64{0, 1, 2}, BitMask: true}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "payload", IsVarlen: true}, Kind: 1, RangeEnd: 10}, }, AlignAttr: 4}}, {Key: StructKey{Name: "tcf_ematch_hdr[TCF_EM_CANID, can_filter]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "tcf_ematch_hdr[TCF_EM_CANID, can_filter]", TypeSize: 16}, Fields: []Type{ @@ -28594,10 +28586,10 @@ var structDescs_amd64 = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bLength", TypeSize: 1}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 16}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDevCapabilityType", TypeSize: 1}}, Val: 2}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_ext_cap_attributes", FldName: "bmAttributes1"}, BitfieldLen: 8, BitfieldUnit: 4}, Vals: []uint64{2, 4, 8, 16}, BitMask: true}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "bmAttributes2"}, BitfieldOff: 8, BitfieldLen: 4, BitfieldUnit: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "bmAttributes3"}, BitfieldOff: 12, BitfieldLen: 4, BitfieldUnit: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "bmAttributes4", TypeSize: 4}, BitfieldOff: 16, BitfieldLen: 16, BitfieldUnit: 4}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_ext_cap_attributes", FldName: "bmAttributes1", TypeSize: 1}, BitfieldLen: 8, BitfieldUnit: 4}, Vals: []uint64{2, 4, 8, 16}, BitMask: true}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "bmAttributes2"}, BitfieldLen: 4, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "bmAttributes3", TypeSize: 1}, BitfieldOff: 4, BitfieldLen: 4, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "bmAttributes4", TypeSize: 2}, BitfieldLen: 16, BitfieldUnit: 4}}, }}}, {Key: StructKey{Name: "usb_generic_cap_descriptor"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_generic_cap_descriptor", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "bLength", TypeSize: 1}}, Path: []string{"parent"}}, @@ -29073,7 +29065,8 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "limit_in_pages"}, BitfieldOff: 4, BitfieldLen: 1, BitfieldUnit: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "seg_not_present"}, BitfieldOff: 5, BitfieldLen: 1, BitfieldUnit: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "useable"}, BitfieldOff: 6, BitfieldLen: 1, BitfieldUnit: 4}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "lm", TypeSize: 4}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "lm", TypeSize: 1}, BitfieldOff: 7, BitfieldLen: 1, BitfieldUnit: 4}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }}}, {Key: StructKey{Name: "userio_cmd[USERIO_CMD_REGISTER]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "userio_cmd[USERIO_CMD_REGISTER]", TypeSize: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "type", TypeSize: 1}}}, @@ -57952,4 +57945,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "5b34ddec157ce195177f39b9d44af364ff26e509" +const revision_amd64 = "98b878855a59e72dcf4fc868902edb0f54e010b2" -- cgit mrf-deployment