From ff722179dad27def48672e5c1a34883eac979161 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 18 Jan 2018 19:50:12 +0100 Subject: sys/linux: make xattr prefix non-zero-terminated --- sys/linux/386.go | 4 ++-- sys/linux/amd64.go | 4 ++-- sys/linux/arm.go | 4 ++-- sys/linux/arm64.go | 4 ++-- sys/linux/ppc64le.go | 4 ++-- sys/linux/xattr.txt | 3 +-- 6 files changed, 11 insertions(+), 12 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/386.go b/sys/linux/386.go index 40efc64b9..1bc568fa3 100644 --- a/sys/linux/386.go +++ b/sys/linux/386.go @@ -8374,7 +8374,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xattr_name_random"}, FldName: "random"}, }}}, {Key: StructKey{Name: "xattr_name_random"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xattr_name_random", IsVarlen: true}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.\x00", "trusted.\x00", "security.\x00", "user.\x00", "btrfs.\x00", "osx.\x00", "os2.\x00"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.", "trusted.", "security.", "user.", "btrfs.", "osx.", "os2."}, NoZ: true}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", IsVarlen: true}, Kind: 2}, }}}, {Key: StructKey{Name: "xfrm_address"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_address", TypeSize: 16}, Fields: []Type{ @@ -20740,4 +20740,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "80dae5c148ad0319ae304addcbaa0b2b734d9edf" +const revision_386 = "a58625a155adbafdb6d85576400c870dd293ac11" diff --git a/sys/linux/amd64.go b/sys/linux/amd64.go index 0aa53e613..ce3176f35 100644 --- a/sys/linux/amd64.go +++ b/sys/linux/amd64.go @@ -8553,7 +8553,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xattr_name_random"}, FldName: "random"}, }}}, {Key: StructKey{Name: "xattr_name_random"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xattr_name_random", IsVarlen: true}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.\x00", "trusted.\x00", "security.\x00", "user.\x00", "btrfs.\x00", "osx.\x00", "os2.\x00"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.", "trusted.", "security.", "user.", "btrfs.", "osx.", "os2."}, NoZ: true}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", IsVarlen: true}, Kind: 2}, }}}, {Key: StructKey{Name: "xfrm_address"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_address", TypeSize: 16}, Fields: []Type{ @@ -21218,4 +21218,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "fb8927bec4fbd62efbc5e7a58e6dc8d4d1b5a57f" +const revision_amd64 = "8ffaa0148f8639607b600ebab1f0f7aeaa427881" diff --git a/sys/linux/arm.go b/sys/linux/arm.go index 868795df2..9f359f03d 100644 --- a/sys/linux/arm.go +++ b/sys/linux/arm.go @@ -8223,7 +8223,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xattr_name_random"}, FldName: "random"}, }}}, {Key: StructKey{Name: "xattr_name_random"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xattr_name_random", IsVarlen: true}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.\x00", "trusted.\x00", "security.\x00", "user.\x00", "btrfs.\x00", "osx.\x00", "os2.\x00"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.", "trusted.", "security.", "user.", "btrfs.", "osx.", "os2."}, NoZ: true}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", IsVarlen: true}, Kind: 2}, }}}, {Key: StructKey{Name: "xfrm_address"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_address", TypeSize: 16}, Fields: []Type{ @@ -20608,4 +20608,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "87255441edf4654aa353be71830ee866973e9b0a" +const revision_arm = "79c79e63a76cb462342ef4d1c97f9adf5365684a" diff --git a/sys/linux/arm64.go b/sys/linux/arm64.go index f40f25481..efe3c8d26 100644 --- a/sys/linux/arm64.go +++ b/sys/linux/arm64.go @@ -8329,7 +8329,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xattr_name_random"}, FldName: "random"}, }}}, {Key: StructKey{Name: "xattr_name_random"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xattr_name_random", IsVarlen: true}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.\x00", "trusted.\x00", "security.\x00", "user.\x00", "btrfs.\x00", "osx.\x00", "os2.\x00"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.", "trusted.", "security.", "user.", "btrfs.", "osx.", "os2."}, NoZ: true}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", IsVarlen: true}, Kind: 2}, }}}, {Key: StructKey{Name: "xfrm_address"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_address", TypeSize: 16}, Fields: []Type{ @@ -20600,4 +20600,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "a1f85424b353c596442d2373f51acf9b456fae4d" +const revision_arm64 = "b4fad1c5cb320123045ed497a3417b923459026a" diff --git a/sys/linux/ppc64le.go b/sys/linux/ppc64le.go index 90c1dd84f..9a51b80e9 100644 --- a/sys/linux/ppc64le.go +++ b/sys/linux/ppc64le.go @@ -8196,7 +8196,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "xattr_name_random"}, FldName: "random"}, }}}, {Key: StructKey{Name: "xattr_name_random"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xattr_name_random", IsVarlen: true}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.\x00", "trusted.\x00", "security.\x00", "user.\x00", "btrfs.\x00", "osx.\x00", "os2.\x00"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "prefix", IsVarlen: true}, Kind: 2, SubKind: "xattr_prefix", Values: []string{"system.", "trusted.", "security.", "user.", "btrfs.", "osx.", "os2."}, NoZ: true}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", IsVarlen: true}, Kind: 2}, }}}, {Key: StructKey{Name: "xfrm_address"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_address", TypeSize: 16}, Fields: []Type{ @@ -20345,4 +20345,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "7efa9eb4e96b44b4874430b17e61c4cfa404dc75" +const revision_ppc64le = "4789a4fb2587ef9a62e6ea7bd9d003140a6458b5" diff --git a/sys/linux/xattr.txt b/sys/linux/xattr.txt index 73b12ac07..2b978a77b 100644 --- a/sys/linux/xattr.txt +++ b/sys/linux/xattr.txt @@ -22,8 +22,7 @@ xattr_name [ ] [varlen] xattr_name_random { -# TODO: the prefix must not be 0-terminated. - prefix string[xattr_prefix] + prefix stringnoz[xattr_prefix] name string } [packed] -- cgit mrf-deployment