diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-11-25 14:28:32 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-11-25 14:30:28 +0100 |
| commit | 6bfd3dd23bb76adbc71f245930d5969243843641 (patch) | |
| tree | ddcc652b5506ebfe77176919d758177240e2594a | |
| parent | 371caf773385df0a40211aa2f91c5fe131a338ee (diff) | |
sys/linux: update to current linux-next
Regenerate consts on linux-next next-20191125.
DEVLINK_ATTR_NETNS_* consts were chifted by 1.
__BPF_FUNC_MAX_ID increased as usual.
CRYPTO_ALG_TYPE_BLKCIPHER, CRYPTO_ALG_TYPE_ABLKCIPHER were removed,
replace them with CRYPTO_ALG_TYPE_SKCIPHER.
28 files changed, 189 insertions, 194 deletions
diff --git a/executor/defs.h b/executor/defs.h index 9eef95bf4..bad6c9481 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "6792726a378bc811cf454f56d0292c98ee9e86e4" +#define SYZ_REVISION "5151faa173fc98e6a82366903779cd31d3ac902c" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "56566c97d7441dd545ac694e01b02123a70cd821" +#define SYZ_REVISION "563f1b5d9502687a98e66246c411d98fc9fb1656" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "aab3e17508bf8fa3741609e0c113bac7c5093dcb" +#define SYZ_REVISION "63ba5ad5df5224899d94f3e6d63630e8a14fed97" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "e932da27fe6063a003eb8ff2047e2cda0b0feb57" +#define SYZ_REVISION "145cbd0e933dc9ba74bbd3235f6c94cf29e2a376" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -110,7 +110,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "ee6e65f4b3a0ee5ea5d9299c96646fa35c54eacd" +#define SYZ_REVISION "658a186cc51be611943a23ad744320187ae69ce4" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/sys/linux/bpf_386.const b/sys/linux/bpf_386.const index a5b577d02..b690e45c5 100644 --- a/sys/linux/bpf_386.const +++ b/sys/linux/bpf_386.const @@ -198,7 +198,7 @@ BTF_KIND_VOLATILE = 9 BTF_MAGIC = 60319 BTF_VERSION = 1 MAX_BPF_REG = 11 -__BPF_FUNC_MAX_ID = 112 +__BPF_FUNC_MAX_ID = 116 __MAX_BPF_REG = 11 __NR_bpf = 357 bpf_call_code = 133 diff --git a/sys/linux/bpf_amd64.const b/sys/linux/bpf_amd64.const index 9b579a2ff..aba97220d 100644 --- a/sys/linux/bpf_amd64.const +++ b/sys/linux/bpf_amd64.const @@ -198,7 +198,7 @@ BTF_KIND_VOLATILE = 9 BTF_MAGIC = 60319 BTF_VERSION = 1 MAX_BPF_REG = 11 -__BPF_FUNC_MAX_ID = 112 +__BPF_FUNC_MAX_ID = 116 __MAX_BPF_REG = 11 __NR_bpf = 321 bpf_call_code = 133 diff --git a/sys/linux/bpf_arm.const b/sys/linux/bpf_arm.const index deaf3213a..0f628c242 100644 --- a/sys/linux/bpf_arm.const +++ b/sys/linux/bpf_arm.const @@ -198,7 +198,7 @@ BTF_KIND_VOLATILE = 9 BTF_MAGIC = 60319 BTF_VERSION = 1 MAX_BPF_REG = 11 -__BPF_FUNC_MAX_ID = 112 +__BPF_FUNC_MAX_ID = 116 __MAX_BPF_REG = 11 __NR_bpf = 386 bpf_call_code = 133 diff --git a/sys/linux/bpf_arm64.const b/sys/linux/bpf_arm64.const index b2e3d9e93..73eaf26d8 100644 --- a/sys/linux/bpf_arm64.const +++ b/sys/linux/bpf_arm64.const @@ -198,7 +198,7 @@ BTF_KIND_VOLATILE = 9 BTF_MAGIC = 60319 BTF_VERSION = 1 MAX_BPF_REG = 11 -__BPF_FUNC_MAX_ID = 112 +__BPF_FUNC_MAX_ID = 116 __MAX_BPF_REG = 11 __NR_bpf = 280 bpf_call_code = 133 diff --git a/sys/linux/bpf_ppc64le.const b/sys/linux/bpf_ppc64le.const index d4ecd4647..3d6991027 100644 --- a/sys/linux/bpf_ppc64le.const +++ b/sys/linux/bpf_ppc64le.const @@ -198,7 +198,7 @@ BTF_KIND_VOLATILE = 9 BTF_MAGIC = 60319 BTF_VERSION = 1 MAX_BPF_REG = 11 -__BPF_FUNC_MAX_ID = 112 +__BPF_FUNC_MAX_ID = 116 __MAX_BPF_REG = 11 __NR_bpf = 361 bpf_call_code = 133 diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index a2c94b868..71b9da720 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -297,9 +297,6 @@ var structDescs_386 = []*KeyedStruct{ {Key: StructKey{Name: "alg_aead_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_aead_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, - {Key: StructKey{Name: "alg_blkcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_blkcipher_name", TypeSize: 64}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, - }}}, {Key: StructKey{Name: "alg_compress_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_compress_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, SubKind: "alg_compress_names", Values: []string{"deflate\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzs\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzjh\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, @@ -309,6 +306,9 @@ var structDescs_386 = []*KeyedStruct{ {Key: StructKey{Name: "alg_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, + {Key: StructKey{Name: "alg_skcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_skcipher_name", TypeSize: 64}, Fields: []Type{ + &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, + }}}, {Key: StructKey{Name: "alloc_mw_cmd", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alloc_mw_cmd", TypeSize: 20, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "command", TypeSize: 4, ArgDir: 2}}, Val: 14}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "in_words", TypeSize: 2, ArgDir: 2}}, Val: 6}, @@ -1142,7 +1142,7 @@ var structDescs_386 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 133}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "regs", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "off", TypeSize: 2}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 112}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 116}, }}}, {Key: StructKey{Name: "bpf_insn_exit"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn_exit", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 149}, @@ -14744,17 +14744,17 @@ var structDescs_386 = []*KeyedStruct{ }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 137}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_namespace", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 140}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeEnd: 4}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]", TypeSize: 8}, Fields: []Type{ @@ -19941,10 +19941,10 @@ var structDescs_386 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "xfrm_algo_compress"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &StructType{Key: StructKey{Name: "xfrm_algo_blkcipher"}, FldName: "payload"}, + &StructType{Key: StructKey{Name: "xfrm_algo_skcipher"}, FldName: "payload"}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]", TypeSize: 20}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -23519,15 +23519,15 @@ var structDescs_386 = []*KeyedStruct{ {Key: StructKey{Name: "sockaddr_alg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_alg", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2, ArgDir: 1}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_ax25"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ax25", TypeSize: 16}, Fields: []Type{ @@ -29942,11 +29942,6 @@ var structDescs_386 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_algo_truncbits", FldName: "alg_icv_len", TypeSize: 4}}, Vals: []uint64{0, 64, 96, 128, 160, 192, 256, 384, 512}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, - {Key: StructKey{Name: "xfrm_algo_blkcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_blkcipher", IsVarlen: true}, Fields: []Type{ - &StructType{Key: StructKey{Name: "alg_blkcipher_name"}, FldName: "alg_name"}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, - }}}, {Key: StructKey{Name: "xfrm_algo_compress"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_compress", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_compress_name"}, FldName: "alg_name"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, @@ -29957,6 +29952,11 @@ var structDescs_386 = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, + {Key: StructKey{Name: "xfrm_algo_skcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_skcipher", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "alg_skcipher_name"}, FldName: "alg_name"}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, + }}}, {Key: StructKey{Name: "xfrm_attrs"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_attrs", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SA, int16], xfrm_usersa_info]"}, FldName: "sa"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_POLICY, int16], xfrm_userpolicy_info]"}, FldName: "policy"}, @@ -29964,7 +29964,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH_TRUNC, int16], xfrm_algo_auth]"}, FldName: "algo_auth_trunc"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AEAD, int16], xfrm_algo_aead]"}, FldName: "algo_aead"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH, int16], xfrm_algo_hash]"}, FldName: "algo_auth"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, FldName: "algo_crypt"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, FldName: "algo_crypt"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_COMP, int16], xfrm_algo_compress]"}, FldName: "algo_comp"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SRCADDR, int16], xfrm_address]"}, FldName: "srcaddr"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, FldName: "coaddr"}, @@ -48395,11 +48395,9 @@ var consts_386 = []ConstValue{ {Name: "CRYPTO_ALG_LARVAL", Value: 16}, {Name: "CRYPTO_ALG_NEED_FALLBACK", Value: 256}, {Name: "CRYPTO_ALG_TESTED", Value: 1024}, - {Name: "CRYPTO_ALG_TYPE_ABLKCIPHER", Value: 5}, {Name: "CRYPTO_ALG_TYPE_AEAD", Value: 3}, {Name: "CRYPTO_ALG_TYPE_AHASH", Value: 15}, {Name: "CRYPTO_ALG_TYPE_AKCIPHER", Value: 13}, - {Name: "CRYPTO_ALG_TYPE_BLKCIPHER", Value: 4}, {Name: "CRYPTO_ALG_TYPE_CIPHER", Value: 1}, {Name: "CRYPTO_ALG_TYPE_COMPRESS", Value: 2}, {Name: "CRYPTO_ALG_TYPE_HASH", Value: 14}, @@ -48407,6 +48405,7 @@ var consts_386 = []ConstValue{ {Name: "CRYPTO_ALG_TYPE_PCOMPRESS", Value: 15}, {Name: "CRYPTO_ALG_TYPE_RNG", Value: 12}, {Name: "CRYPTO_ALG_TYPE_SHASH", Value: 14}, + {Name: "CRYPTO_ALG_TYPE_SKCIPHER", Value: 5}, {Name: "CRYPTO_MAX_NAME", Value: 64}, {Name: "CRYPTO_MSG_DELALG", Value: 17}, {Name: "CRYPTO_MSG_DELRNG", Value: 20}, @@ -48443,9 +48442,9 @@ var consts_386 = []ConstValue{ {Name: "DCCP_SOCKOPT_TX_CCID", Value: 14}, {Name: "DEVLINK_ATTR_BUS_NAME", Value: 1}, {Name: "DEVLINK_ATTR_DEV_NAME", Value: 2}, - {Name: "DEVLINK_ATTR_NETNS_FD", Value: 137}, - {Name: "DEVLINK_ATTR_NETNS_ID", Value: 139}, - {Name: "DEVLINK_ATTR_NETNS_PID", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_FD", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_ID", Value: 140}, + {Name: "DEVLINK_ATTR_NETNS_PID", Value: 139}, {Name: "DEVLINK_ATTR_PORT_INDEX", Value: 3}, {Name: "DEVLINK_ATTR_PORT_TYPE", Value: 4}, {Name: "DEVLINK_CMD_GET", Value: 1}, @@ -55590,7 +55589,7 @@ var consts_386 = []ConstValue{ {Name: "_LINUX_CAPABILITY_VERSION_1", Value: 429392688}, {Name: "_LINUX_CAPABILITY_VERSION_2", Value: 537333798}, {Name: "_LINUX_CAPABILITY_VERSION_3", Value: 537396514}, - {Name: "__BPF_FUNC_MAX_ID", Value: 112}, + {Name: "__BPF_FUNC_MAX_ID", Value: 116}, {Name: "__MAX_BPF_REG", Value: 11}, {Name: "__NR_accept4", Value: 364}, {Name: "__NR_acct", Value: 51}, @@ -55909,4 +55908,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "6792726a378bc811cf454f56d0292c98ee9e86e4" +const revision_386 = "5151faa173fc98e6a82366903779cd31d3ac902c" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index 394376dcb..c6e3d226b 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -298,9 +298,6 @@ var structDescs_amd64 = []*KeyedStruct{ {Key: StructKey{Name: "alg_aead_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_aead_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, - {Key: StructKey{Name: "alg_blkcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_blkcipher_name", TypeSize: 64}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, - }}}, {Key: StructKey{Name: "alg_compress_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_compress_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, SubKind: "alg_compress_names", Values: []string{"deflate\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzs\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzjh\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, @@ -310,6 +307,9 @@ var structDescs_amd64 = []*KeyedStruct{ {Key: StructKey{Name: "alg_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, + {Key: StructKey{Name: "alg_skcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_skcipher_name", TypeSize: 64}, Fields: []Type{ + &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, + }}}, {Key: StructKey{Name: "alloc_mw_cmd", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alloc_mw_cmd", TypeSize: 24, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "command", TypeSize: 4, ArgDir: 2}}, Val: 14}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "in_words", TypeSize: 2, ArgDir: 2}}, Val: 6}, @@ -1145,7 +1145,7 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 133}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "regs", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "off", TypeSize: 2}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 112}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 116}, }}}, {Key: StructKey{Name: "bpf_insn_exit"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn_exit", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 149}, @@ -15053,17 +15053,17 @@ var structDescs_amd64 = []*KeyedStruct{ }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 137}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_namespace", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 140}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeEnd: 4}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]", TypeSize: 8}, Fields: []Type{ @@ -20250,10 +20250,10 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "xfrm_algo_compress"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &StructType{Key: StructKey{Name: "xfrm_algo_blkcipher"}, FldName: "payload"}, + &StructType{Key: StructKey{Name: "xfrm_algo_skcipher"}, FldName: "payload"}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]", TypeSize: 20}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -23850,15 +23850,15 @@ var structDescs_amd64 = []*KeyedStruct{ {Key: StructKey{Name: "sockaddr_alg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_alg", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2, ArgDir: 1}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_ax25"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ax25", TypeSize: 16}, Fields: []Type{ @@ -30339,11 +30339,6 @@ var structDescs_amd64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_algo_truncbits", FldName: "alg_icv_len", TypeSize: 4}}, Vals: []uint64{0, 64, 96, 128, 160, 192, 256, 384, 512}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, - {Key: StructKey{Name: "xfrm_algo_blkcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_blkcipher", IsVarlen: true}, Fields: []Type{ - &StructType{Key: StructKey{Name: "alg_blkcipher_name"}, FldName: "alg_name"}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, - }}}, {Key: StructKey{Name: "xfrm_algo_compress"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_compress", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_compress_name"}, FldName: "alg_name"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, @@ -30354,6 +30349,11 @@ var structDescs_amd64 = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, + {Key: StructKey{Name: "xfrm_algo_skcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_skcipher", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "alg_skcipher_name"}, FldName: "alg_name"}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, + }}}, {Key: StructKey{Name: "xfrm_attrs"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_attrs", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SA, int16], xfrm_usersa_info]"}, FldName: "sa"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_POLICY, int16], xfrm_userpolicy_info]"}, FldName: "policy"}, @@ -30361,7 +30361,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH_TRUNC, int16], xfrm_algo_auth]"}, FldName: "algo_auth_trunc"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AEAD, int16], xfrm_algo_aead]"}, FldName: "algo_aead"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH, int16], xfrm_algo_hash]"}, FldName: "algo_auth"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, FldName: "algo_crypt"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, FldName: "algo_crypt"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_COMP, int16], xfrm_algo_compress]"}, FldName: "algo_comp"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SRCADDR, int16], xfrm_address]"}, FldName: "srcaddr"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, FldName: "coaddr"}, @@ -48935,11 +48935,9 @@ var consts_amd64 = []ConstValue{ {Name: "CRYPTO_ALG_LARVAL", Value: 16}, {Name: "CRYPTO_ALG_NEED_FALLBACK", Value: 256}, {Name: "CRYPTO_ALG_TESTED", Value: 1024}, - {Name: "CRYPTO_ALG_TYPE_ABLKCIPHER", Value: 5}, {Name: "CRYPTO_ALG_TYPE_AEAD", Value: 3}, {Name: "CRYPTO_ALG_TYPE_AHASH", Value: 15}, {Name: "CRYPTO_ALG_TYPE_AKCIPHER", Value: 13}, - {Name: "CRYPTO_ALG_TYPE_BLKCIPHER", Value: 4}, {Name: "CRYPTO_ALG_TYPE_CIPHER", Value: 1}, {Name: "CRYPTO_ALG_TYPE_COMPRESS", Value: 2}, {Name: "CRYPTO_ALG_TYPE_HASH", Value: 14}, @@ -48947,6 +48945,7 @@ var consts_amd64 = []ConstValue{ {Name: "CRYPTO_ALG_TYPE_PCOMPRESS", Value: 15}, {Name: "CRYPTO_ALG_TYPE_RNG", Value: 12}, {Name: "CRYPTO_ALG_TYPE_SHASH", Value: 14}, + {Name: "CRYPTO_ALG_TYPE_SKCIPHER", Value: 5}, {Name: "CRYPTO_MAX_NAME", Value: 64}, {Name: "CRYPTO_MSG_DELALG", Value: 17}, {Name: "CRYPTO_MSG_DELRNG", Value: 20}, @@ -48983,9 +48982,9 @@ var consts_amd64 = []ConstValue{ {Name: "DCCP_SOCKOPT_TX_CCID", Value: 14}, {Name: "DEVLINK_ATTR_BUS_NAME", Value: 1}, {Name: "DEVLINK_ATTR_DEV_NAME", Value: 2}, - {Name: "DEVLINK_ATTR_NETNS_FD", Value: 137}, - {Name: "DEVLINK_ATTR_NETNS_ID", Value: 139}, - {Name: "DEVLINK_ATTR_NETNS_PID", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_FD", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_ID", Value: 140}, + {Name: "DEVLINK_ATTR_NETNS_PID", Value: 139}, {Name: "DEVLINK_ATTR_PORT_INDEX", Value: 3}, {Name: "DEVLINK_ATTR_PORT_TYPE", Value: 4}, {Name: "DEVLINK_CMD_GET", Value: 1}, @@ -56144,7 +56143,7 @@ var consts_amd64 = []ConstValue{ {Name: "_LINUX_CAPABILITY_VERSION_1", Value: 429392688}, {Name: "_LINUX_CAPABILITY_VERSION_2", Value: 537333798}, {Name: "_LINUX_CAPABILITY_VERSION_3", Value: 537396514}, - {Name: "__BPF_FUNC_MAX_ID", Value: 112}, + {Name: "__BPF_FUNC_MAX_ID", Value: 116}, {Name: "__MAX_BPF_REG", Value: 11}, {Name: "__NR_accept", Value: 43}, {Name: "__NR_accept4", Value: 288}, @@ -56464,4 +56463,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "56566c97d7441dd545ac694e01b02123a70cd821" +const revision_amd64 = "563f1b5d9502687a98e66246c411d98fc9fb1656" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index 20b734747..007c6db31 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -297,9 +297,6 @@ var structDescs_arm = []*KeyedStruct{ {Key: StructKey{Name: "alg_aead_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_aead_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, - {Key: StructKey{Name: "alg_blkcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_blkcipher_name", TypeSize: 64}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, - }}}, {Key: StructKey{Name: "alg_compress_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_compress_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, SubKind: "alg_compress_names", Values: []string{"deflate\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzs\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzjh\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, @@ -309,6 +306,9 @@ var structDescs_arm = []*KeyedStruct{ {Key: StructKey{Name: "alg_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, + {Key: StructKey{Name: "alg_skcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_skcipher_name", TypeSize: 64}, Fields: []Type{ + &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, + }}}, {Key: StructKey{Name: "alloc_mw_cmd", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alloc_mw_cmd", TypeSize: 20, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "command", TypeSize: 4, ArgDir: 2}}, Val: 14}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "in_words", TypeSize: 2, ArgDir: 2}}, Val: 6}, @@ -1142,7 +1142,7 @@ var structDescs_arm = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 133}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "regs", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "off", TypeSize: 2}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 112}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 116}, }}}, {Key: StructKey{Name: "bpf_insn_exit"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn_exit", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 149}, @@ -14561,17 +14561,17 @@ var structDescs_arm = []*KeyedStruct{ }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 137}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_namespace", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 140}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeEnd: 4}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]", TypeSize: 8}, Fields: []Type{ @@ -19758,10 +19758,10 @@ var structDescs_arm = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "xfrm_algo_compress"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &StructType{Key: StructKey{Name: "xfrm_algo_blkcipher"}, FldName: "payload"}, + &StructType{Key: StructKey{Name: "xfrm_algo_skcipher"}, FldName: "payload"}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]", TypeSize: 20}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -23341,15 +23341,15 @@ var structDescs_arm = []*KeyedStruct{ {Key: StructKey{Name: "sockaddr_alg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_alg", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2, ArgDir: 1}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_ax25"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ax25", TypeSize: 16}, Fields: []Type{ @@ -29748,11 +29748,6 @@ var structDescs_arm = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_algo_truncbits", FldName: "alg_icv_len", TypeSize: 4}}, Vals: []uint64{0, 64, 96, 128, 160, 192, 256, 384, 512}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, - {Key: StructKey{Name: "xfrm_algo_blkcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_blkcipher", IsVarlen: true}, Fields: []Type{ - &StructType{Key: StructKey{Name: "alg_blkcipher_name"}, FldName: "alg_name"}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, - }}}, {Key: StructKey{Name: "xfrm_algo_compress"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_compress", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_compress_name"}, FldName: "alg_name"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, @@ -29763,6 +29758,11 @@ var structDescs_arm = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, + {Key: StructKey{Name: "xfrm_algo_skcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_skcipher", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "alg_skcipher_name"}, FldName: "alg_name"}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, + }}}, {Key: StructKey{Name: "xfrm_attrs"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_attrs", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SA, int16], xfrm_usersa_info]"}, FldName: "sa"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_POLICY, int16], xfrm_userpolicy_info]"}, FldName: "policy"}, @@ -29770,7 +29770,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH_TRUNC, int16], xfrm_algo_auth]"}, FldName: "algo_auth_trunc"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AEAD, int16], xfrm_algo_aead]"}, FldName: "algo_aead"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH, int16], xfrm_algo_hash]"}, FldName: "algo_auth"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, FldName: "algo_crypt"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, FldName: "algo_crypt"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_COMP, int16], xfrm_algo_compress]"}, FldName: "algo_comp"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SRCADDR, int16], xfrm_address]"}, FldName: "srcaddr"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, FldName: "coaddr"}, @@ -48035,11 +48035,9 @@ var consts_arm = []ConstValue{ {Name: "CRYPTO_ALG_LARVAL", Value: 16}, {Name: "CRYPTO_ALG_NEED_FALLBACK", Value: 256}, {Name: "CRYPTO_ALG_TESTED", Value: 1024}, - {Name: "CRYPTO_ALG_TYPE_ABLKCIPHER", Value: 5}, {Name: "CRYPTO_ALG_TYPE_AEAD", Value: 3}, {Name: "CRYPTO_ALG_TYPE_AHASH", Value: 15}, {Name: "CRYPTO_ALG_TYPE_AKCIPHER", Value: 13}, - {Name: "CRYPTO_ALG_TYPE_BLKCIPHER", Value: 4}, {Name: "CRYPTO_ALG_TYPE_CIPHER", Value: 1}, {Name: "CRYPTO_ALG_TYPE_COMPRESS", Value: 2}, {Name: "CRYPTO_ALG_TYPE_HASH", Value: 14}, @@ -48047,6 +48045,7 @@ var consts_arm = []ConstValue{ {Name: "CRYPTO_ALG_TYPE_PCOMPRESS", Value: 15}, {Name: "CRYPTO_ALG_TYPE_RNG", Value: 12}, {Name: "CRYPTO_ALG_TYPE_SHASH", Value: 14}, + {Name: "CRYPTO_ALG_TYPE_SKCIPHER", Value: 5}, {Name: "CRYPTO_MAX_NAME", Value: 64}, {Name: "CRYPTO_MSG_DELALG", Value: 17}, {Name: "CRYPTO_MSG_DELRNG", Value: 20}, @@ -48083,9 +48082,9 @@ var consts_arm = []ConstValue{ {Name: "DCCP_SOCKOPT_TX_CCID", Value: 14}, {Name: "DEVLINK_ATTR_BUS_NAME", Value: 1}, {Name: "DEVLINK_ATTR_DEV_NAME", Value: 2}, - {Name: "DEVLINK_ATTR_NETNS_FD", Value: 137}, - {Name: "DEVLINK_ATTR_NETNS_ID", Value: 139}, - {Name: "DEVLINK_ATTR_NETNS_PID", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_FD", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_ID", Value: 140}, + {Name: "DEVLINK_ATTR_NETNS_PID", Value: 139}, {Name: "DEVLINK_ATTR_PORT_INDEX", Value: 3}, {Name: "DEVLINK_ATTR_PORT_TYPE", Value: 4}, {Name: "DEVLINK_CMD_GET", Value: 1}, @@ -55177,7 +55176,7 @@ var consts_arm = []ConstValue{ {Name: "_LINUX_CAPABILITY_VERSION_1", Value: 429392688}, {Name: "_LINUX_CAPABILITY_VERSION_2", Value: 537333798}, {Name: "_LINUX_CAPABILITY_VERSION_3", Value: 537396514}, - {Name: "__BPF_FUNC_MAX_ID", Value: 112}, + {Name: "__BPF_FUNC_MAX_ID", Value: 116}, {Name: "__MAX_BPF_REG", Value: 11}, {Name: "__NR_accept", Value: 285}, {Name: "__NR_accept4", Value: 366}, @@ -55486,4 +55485,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "aab3e17508bf8fa3741609e0c113bac7c5093dcb" +const revision_arm = "63ba5ad5df5224899d94f3e6d63630e8a14fed97" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index a8f62b5d6..31c8eedfb 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -298,9 +298,6 @@ var structDescs_arm64 = []*KeyedStruct{ {Key: StructKey{Name: "alg_aead_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_aead_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, - {Key: StructKey{Name: "alg_blkcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_blkcipher_name", TypeSize: 64}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, - }}}, {Key: StructKey{Name: "alg_compress_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_compress_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, SubKind: "alg_compress_names", Values: []string{"deflate\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzs\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzjh\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, @@ -310,6 +307,9 @@ var structDescs_arm64 = []*KeyedStruct{ {Key: StructKey{Name: "alg_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, + {Key: StructKey{Name: "alg_skcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_skcipher_name", TypeSize: 64}, Fields: []Type{ + &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, + }}}, {Key: StructKey{Name: "alloc_mw_cmd", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alloc_mw_cmd", TypeSize: 24, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "command", TypeSize: 4, ArgDir: 2}}, Val: 14}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "in_words", TypeSize: 2, ArgDir: 2}}, Val: 6}, @@ -1145,7 +1145,7 @@ var structDescs_arm64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 133}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "regs", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "off", TypeSize: 2}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 112}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 116}, }}}, {Key: StructKey{Name: "bpf_insn_exit"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn_exit", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 149}, @@ -14870,17 +14870,17 @@ var structDescs_arm64 = []*KeyedStruct{ }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 137}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_namespace", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 140}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeEnd: 4}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]", TypeSize: 8}, Fields: []Type{ @@ -20067,10 +20067,10 @@ var structDescs_arm64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "xfrm_algo_compress"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &StructType{Key: StructKey{Name: "xfrm_algo_blkcipher"}, FldName: "payload"}, + &StructType{Key: StructKey{Name: "xfrm_algo_skcipher"}, FldName: "payload"}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]", TypeSize: 20}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -23667,15 +23667,15 @@ var structDescs_arm64 = []*KeyedStruct{ {Key: StructKey{Name: "sockaddr_alg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_alg", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2, ArgDir: 1}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_ax25"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ax25", TypeSize: 16}, Fields: []Type{ @@ -30131,11 +30131,6 @@ var structDescs_arm64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_algo_truncbits", FldName: "alg_icv_len", TypeSize: 4}}, Vals: []uint64{0, 64, 96, 128, 160, 192, 256, 384, 512}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, - {Key: StructKey{Name: "xfrm_algo_blkcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_blkcipher", IsVarlen: true}, Fields: []Type{ - &StructType{Key: StructKey{Name: "alg_blkcipher_name"}, FldName: "alg_name"}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, - }}}, {Key: StructKey{Name: "xfrm_algo_compress"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_compress", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_compress_name"}, FldName: "alg_name"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, @@ -30146,6 +30141,11 @@ var structDescs_arm64 = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, + {Key: StructKey{Name: "xfrm_algo_skcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_skcipher", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "alg_skcipher_name"}, FldName: "alg_name"}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, + }}}, {Key: StructKey{Name: "xfrm_attrs"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_attrs", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SA, int16], xfrm_usersa_info]"}, FldName: "sa"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_POLICY, int16], xfrm_userpolicy_info]"}, FldName: "policy"}, @@ -30153,7 +30153,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH_TRUNC, int16], xfrm_algo_auth]"}, FldName: "algo_auth_trunc"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AEAD, int16], xfrm_algo_aead]"}, FldName: "algo_aead"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH, int16], xfrm_algo_hash]"}, FldName: "algo_auth"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, FldName: "algo_crypt"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, FldName: "algo_crypt"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_COMP, int16], xfrm_algo_compress]"}, FldName: "algo_comp"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SRCADDR, int16], xfrm_address]"}, FldName: "srcaddr"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, FldName: "coaddr"}, @@ -48381,11 +48381,9 @@ var consts_arm64 = []ConstValue{ {Name: "CRYPTO_ALG_LARVAL", Value: 16}, {Name: "CRYPTO_ALG_NEED_FALLBACK", Value: 256}, {Name: "CRYPTO_ALG_TESTED", Value: 1024}, - {Name: "CRYPTO_ALG_TYPE_ABLKCIPHER", Value: 5}, {Name: "CRYPTO_ALG_TYPE_AEAD", Value: 3}, {Name: "CRYPTO_ALG_TYPE_AHASH", Value: 15}, {Name: "CRYPTO_ALG_TYPE_AKCIPHER", Value: 13}, - {Name: "CRYPTO_ALG_TYPE_BLKCIPHER", Value: 4}, {Name: "CRYPTO_ALG_TYPE_CIPHER", Value: 1}, {Name: "CRYPTO_ALG_TYPE_COMPRESS", Value: 2}, {Name: "CRYPTO_ALG_TYPE_HASH", Value: 14}, @@ -48393,6 +48391,7 @@ var consts_arm64 = []ConstValue{ {Name: "CRYPTO_ALG_TYPE_PCOMPRESS", Value: 15}, {Name: "CRYPTO_ALG_TYPE_RNG", Value: 12}, {Name: "CRYPTO_ALG_TYPE_SHASH", Value: 14}, + {Name: "CRYPTO_ALG_TYPE_SKCIPHER", Value: 5}, {Name: "CRYPTO_MAX_NAME", Value: 64}, {Name: "CRYPTO_MSG_DELALG", Value: 17}, {Name: "CRYPTO_MSG_DELRNG", Value: 20}, @@ -48429,9 +48428,9 @@ var consts_arm64 = []ConstValue{ {Name: "DCCP_SOCKOPT_TX_CCID", Value: 14}, {Name: "DEVLINK_ATTR_BUS_NAME", Value: 1}, {Name: "DEVLINK_ATTR_DEV_NAME", Value: 2}, - {Name: "DEVLINK_ATTR_NETNS_FD", Value: 137}, - {Name: "DEVLINK_ATTR_NETNS_ID", Value: 139}, - {Name: "DEVLINK_ATTR_NETNS_PID", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_FD", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_ID", Value: 140}, + {Name: "DEVLINK_ATTR_NETNS_PID", Value: 139}, {Name: "DEVLINK_ATTR_PORT_INDEX", Value: 3}, {Name: "DEVLINK_ATTR_PORT_TYPE", Value: 4}, {Name: "DEVLINK_CMD_GET", Value: 1}, @@ -55537,7 +55536,7 @@ var consts_arm64 = []ConstValue{ {Name: "_LINUX_CAPABILITY_VERSION_1", Value: 429392688}, {Name: "_LINUX_CAPABILITY_VERSION_2", Value: 537333798}, {Name: "_LINUX_CAPABILITY_VERSION_3", Value: 537396514}, - {Name: "__BPF_FUNC_MAX_ID", Value: 112}, + {Name: "__BPF_FUNC_MAX_ID", Value: 116}, {Name: "__MAX_BPF_REG", Value: 11}, {Name: "__NR_accept", Value: 202}, {Name: "__NR_accept4", Value: 242}, @@ -55816,4 +55815,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "e932da27fe6063a003eb8ff2047e2cda0b0feb57" +const revision_arm64 = "145cbd0e933dc9ba74bbd3235f6c94cf29e2a376" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index c4cb37c3a..c2c3b544d 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -297,9 +297,6 @@ var structDescs_ppc64le = []*KeyedStruct{ {Key: StructKey{Name: "alg_aead_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_aead_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, - {Key: StructKey{Name: "alg_blkcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_blkcipher_name", TypeSize: 64}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, - }}}, {Key: StructKey{Name: "alg_compress_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_compress_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, SubKind: "alg_compress_names", Values: []string{"deflate\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzs\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", "lzjh\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, @@ -309,6 +306,9 @@ var structDescs_ppc64le = []*KeyedStruct{ {Key: StructKey{Name: "alg_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_name", TypeSize: 64}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, + {Key: StructKey{Name: "alg_skcipher_name"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alg_skcipher_name", TypeSize: 64}, Fields: []Type{ + &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, + }}}, {Key: StructKey{Name: "alloc_mw_cmd", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "alloc_mw_cmd", TypeSize: 24, ArgDir: 2}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "command", TypeSize: 4, ArgDir: 2}}, Val: 14}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "in_words", TypeSize: 2, ArgDir: 2}}, Val: 6}, @@ -1144,7 +1144,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 133}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "regs", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "off", TypeSize: 2}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 112}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 1, RangeEnd: 116}, }}}, {Key: StructKey{Name: "bpf_insn_exit"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn_exit", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 149}, @@ -14822,17 +14822,17 @@ var structDescs_ppc64le = []*KeyedStruct{ }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_FD, int16], fd_namespace]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 137}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_namespace", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_ID, int16], netns_id]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 140}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "payload", TypeSize: 4}}, Kind: 1, RangeEnd: 4}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_NETNS_PID, int16], pid]", TypeSize: 8}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 138}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 139}, &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "payload", TypeSize: 4}}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[DEVLINK_ATTR_PORT_INDEX, int16], int32[0:3]]", TypeSize: 8}, Fields: []Type{ @@ -20019,10 +20019,10 @@ var structDescs_ppc64le = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, &StructType{Key: StructKey{Name: "xfrm_algo_compress"}, FldName: "payload"}, }, AlignAttr: 4}}, - {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]", IsVarlen: true}, Fields: []Type{ + {Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]", IsVarlen: true}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 2}, - &StructType{Key: StructKey{Name: "xfrm_algo_blkcipher"}, FldName: "payload"}, + &StructType{Key: StructKey{Name: "xfrm_algo_skcipher"}, FldName: "payload"}, }, AlignAttr: 4}}, {Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]", TypeSize: 20}, Fields: []Type{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nla_len", TypeSize: 2}}, Path: []string{"parent"}}, @@ -23619,15 +23619,15 @@ var structDescs_ppc64le = []*KeyedStruct{ {Key: StructKey{Name: "sockaddr_alg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_alg", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_alg", TypeSize: 88, ArgDir: 1}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2, ArgDir: 1}}, Val: 38}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "type", TypeSize: 14, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 4, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "feat", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "af_alg_type", FldName: "mask", TypeSize: 4, ArgDir: 1}}, Vals: []uint64{15, 1, 2, 3, 5, 14, 14, 15, 12, 13, 15, 16, 32, 64, 128, 256, 1024, 2048, 4096, 8192}}, &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "name", TypeSize: 64, ArgDir: 1}, Kind: 2, Values: []string{"filled later\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "sockaddr_ax25"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_ax25", TypeSize: 16}, Fields: []Type{ @@ -30026,11 +30026,6 @@ var structDescs_ppc64le = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "xfrm_algo_truncbits", FldName: "alg_icv_len", TypeSize: 4}}, Vals: []uint64{0, 64, 96, 128, 160, 192, 256, 384, 512}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, - {Key: StructKey{Name: "xfrm_algo_blkcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_blkcipher", IsVarlen: true}, Fields: []Type{ - &StructType{Key: StructKey{Name: "alg_blkcipher_name"}, FldName: "alg_name"}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, - }}}, {Key: StructKey{Name: "xfrm_algo_compress"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_compress", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "alg_compress_name"}, FldName: "alg_name"}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, @@ -30041,6 +30036,11 @@ var structDescs_ppc64le = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, }}}, + {Key: StructKey{Name: "xfrm_algo_skcipher"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_algo_skcipher", IsVarlen: true}, Fields: []Type{ + &StructType{Key: StructKey{Name: "alg_skcipher_name"}, FldName: "alg_name"}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "alg_key_len", TypeSize: 4}}, BitSize: 1, Path: []string{"alg_key"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "alg_key", IsVarlen: true}}, + }}}, {Key: StructKey{Name: "xfrm_attrs"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "xfrm_attrs", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SA, int16], xfrm_usersa_info]"}, FldName: "sa"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_POLICY, int16], xfrm_userpolicy_info]"}, FldName: "policy"}, @@ -30048,7 +30048,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH_TRUNC, int16], xfrm_algo_auth]"}, FldName: "algo_auth_trunc"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AEAD, int16], xfrm_algo_aead]"}, FldName: "algo_aead"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_AUTH, int16], xfrm_algo_hash]"}, FldName: "algo_auth"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_blkcipher]"}, FldName: "algo_crypt"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_CRYPT, int16], xfrm_algo_skcipher]"}, FldName: "algo_crypt"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_ALG_COMP, int16], xfrm_algo_compress]"}, FldName: "algo_comp"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_SRCADDR, int16], xfrm_address]"}, FldName: "srcaddr"}, &StructType{Key: StructKey{Name: "nlattr_t[const[XFRMA_COADDR, int16], xfrm_address]"}, FldName: "coaddr"}, @@ -48375,11 +48375,9 @@ var consts_ppc64le = []ConstValue{ {Name: "CRYPTO_ALG_LARVAL", Value: 16}, {Name: "CRYPTO_ALG_NEED_FALLBACK", Value: 256}, {Name: "CRYPTO_ALG_TESTED", Value: 1024}, - {Name: "CRYPTO_ALG_TYPE_ABLKCIPHER", Value: 5}, {Name: "CRYPTO_ALG_TYPE_AEAD", Value: 3}, {Name: "CRYPTO_ALG_TYPE_AHASH", Value: 15}, {Name: "CRYPTO_ALG_TYPE_AKCIPHER", Value: 13}, - {Name: "CRYPTO_ALG_TYPE_BLKCIPHER", Value: 4}, {Name: "CRYPTO_ALG_TYPE_CIPHER", Value: 1}, {Name: "CRYPTO_ALG_TYPE_COMPRESS", Value: 2}, {Name: "CRYPTO_ALG_TYPE_HASH", Value: 14}, @@ -48387,6 +48385,7 @@ var consts_ppc64le = []ConstValue{ {Name: "CRYPTO_ALG_TYPE_PCOMPRESS", Value: 15}, {Name: "CRYPTO_ALG_TYPE_RNG", Value: 12}, {Name: "CRYPTO_ALG_TYPE_SHASH", Value: 14}, + {Name: "CRYPTO_ALG_TYPE_SKCIPHER", Value: 5}, {Name: "CRYPTO_MAX_NAME", Value: 64}, {Name: "CRYPTO_MSG_DELALG", Value: 17}, {Name: "CRYPTO_MSG_DELRNG", Value: 20}, @@ -48423,9 +48422,9 @@ var consts_ppc64le = []ConstValue{ {Name: "DCCP_SOCKOPT_TX_CCID", Value: 14}, {Name: "DEVLINK_ATTR_BUS_NAME", Value: 1}, {Name: "DEVLINK_ATTR_DEV_NAME", Value: 2}, - {Name: "DEVLINK_ATTR_NETNS_FD", Value: 137}, - {Name: "DEVLINK_ATTR_NETNS_ID", Value: 139}, - {Name: "DEVLINK_ATTR_NETNS_PID", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_FD", Value: 138}, + {Name: "DEVLINK_ATTR_NETNS_ID", Value: 140}, + {Name: "DEVLINK_ATTR_NETNS_PID", Value: 139}, {Name: "DEVLINK_ATTR_PORT_INDEX", Value: 3}, {Name: "DEVLINK_ATTR_PORT_TYPE", Value: 4}, {Name: "DEVLINK_CMD_GET", Value: 1}, @@ -50292,7 +50291,7 @@ var consts_ppc64le = []ConstValue{ {Name: "KCOV_DISABLE", Value: 536896357}, {Name: "KCOV_ENABLE", Value: 536896356}, {Name: "KCOV_INIT_TRACE", Value: 1074291457}, - {Name: "KCOV_REMOTE_ENABLE", Value: 1075340134}, + {Name: "KCOV_REMOTE_ENABLE", Value: 2149081958}, {Name: "KCOV_TRACE_CMP", Value: 1}, {Name: "KCOV_TRACE_PC"}, {Name: "KDADDIO", Value: 19252}, @@ -55466,7 +55465,7 @@ var consts_ppc64le = []ConstValue{ {Name: "_LINUX_CAPABILITY_VERSION_1", Value: 429392688}, {Name: "_LINUX_CAPABILITY_VERSION_2", Value: 537333798}, {Name: "_LINUX_CAPABILITY_VERSION_3", Value: 537396514}, - {Name: "__BPF_FUNC_MAX_ID", Value: 112}, + {Name: "__BPF_FUNC_MAX_ID", Value: 116}, {Name: "__MAX_BPF_REG", Value: 11}, {Name: "__NR_accept", Value: 330}, {Name: "__NR_accept4", Value: 344}, @@ -55781,4 +55780,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "ee6e65f4b3a0ee5ea5d9299c96646fa35c54eacd" +const revision_ppc64le = "658a186cc51be611943a23ad744320187ae69ce4" diff --git a/sys/linux/init.go b/sys/linux/init.go index 5ae9f001d..94565a9d3 100644 --- a/sys/linux/init.go +++ b/sys/linux/init.go @@ -57,7 +57,7 @@ func InitTarget(target *prog.Target) { "alg_name": arch.generateAlgName, "alg_aead_name": arch.generateAlgAeadName, "alg_hash_name": arch.generateAlgHashName, - "alg_blkcipher_name": arch.generateAlgBlkcipherhName, + "alg_skcipher_name": arch.generateAlgSkcipherhName, "ipt_replace": arch.generateIptables, "ip6t_replace": arch.generateIptables, "arpt_replace": arch.generateArptables, diff --git a/sys/linux/init_alg.go b/sys/linux/init_alg.go index 41b66ac20..f70a1385c 100644 --- a/sys/linux/init_alg.go +++ b/sys/linux/init_alg.go @@ -50,9 +50,9 @@ func (arch *arch) generateAlgHashName(g *prog.Gen, typ prog.Type, old prog.Arg) return generateAlgNameStruct(g, typ, ALG_HASH) } -func (arch *arch) generateAlgBlkcipherhName(g *prog.Gen, typ prog.Type, old prog.Arg) ( +func (arch *arch) generateAlgSkcipherhName(g *prog.Gen, typ prog.Type, old prog.Arg) ( arg prog.Arg, calls []*prog.Call) { - return generateAlgNameStruct(g, typ, ALG_BLKCIPHER) + return generateAlgNameStruct(g, typ, ALG_SKCIPHER) } func generateAlgNameStruct(g *prog.Gen, typ0 prog.Type, algTyp int) (arg prog.Arg, calls []*prog.Call) { @@ -108,7 +108,7 @@ type algDesc struct { const ( ALG_CIPHER = iota - ALG_BLKCIPHER + ALG_SKCIPHER ALG_AEAD ALG_HASH ALG_RNG @@ -116,7 +116,7 @@ const ( var allTypes = []algType{ {"aead", ALG_AEAD}, - {"skcipher", ALG_BLKCIPHER}, + {"skcipher", ALG_SKCIPHER}, {"hash", ALG_HASH}, {"rng", ALG_RNG}, } @@ -124,20 +124,20 @@ var allTypes = []algType{ var allAlgs = map[int][]algDesc{ ALG_AEAD: { // templates: - {"authenc", []int{ALG_HASH, ALG_BLKCIPHER}}, - {"authencesn", []int{ALG_HASH, ALG_BLKCIPHER}}, + {"authenc", []int{ALG_HASH, ALG_SKCIPHER}}, + {"authencesn", []int{ALG_HASH, ALG_SKCIPHER}}, {"ccm", []int{ALG_CIPHER}}, - {"ccm_base", []int{ALG_BLKCIPHER, ALG_HASH}}, + {"ccm_base", []int{ALG_SKCIPHER, ALG_HASH}}, {"echainiv", []int{ALG_AEAD}}, {"essiv", []int{ALG_AEAD, ALG_HASH}}, {"gcm", []int{ALG_CIPHER}}, - {"gcm_base", []int{ALG_BLKCIPHER, ALG_HASH}}, + {"gcm_base", []int{ALG_SKCIPHER, ALG_HASH}}, {"pcrypt", []int{ALG_AEAD}}, {"rfc4106", []int{ALG_AEAD}}, {"rfc4309", []int{ALG_AEAD}}, {"rfc4543", []int{ALG_AEAD}}, - {"rfc7539", []int{ALG_BLKCIPHER, ALG_HASH}}, - {"rfc7539esp", []int{ALG_BLKCIPHER, ALG_HASH}}, + {"rfc7539", []int{ALG_SKCIPHER, ALG_HASH}}, + {"rfc7539esp", []int{ALG_SKCIPHER, ALG_HASH}}, {"seqiv", []int{ALG_AEAD}}, // algorithms: @@ -165,25 +165,25 @@ var allAlgs = map[int][]algDesc{ {"rfc4106(gcm(aes))", nil}, {"rfc4106-gcm-aesni", nil}, }, - ALG_BLKCIPHER: { + ALG_SKCIPHER: { // templates: - {"adiantum", []int{ALG_BLKCIPHER, ALG_CIPHER, ALG_HASH}}, - {"adiantum", []int{ALG_BLKCIPHER, ALG_CIPHER}}, + {"adiantum", []int{ALG_SKCIPHER, ALG_CIPHER, ALG_HASH}}, + {"adiantum", []int{ALG_SKCIPHER, ALG_CIPHER}}, {"cbc", []int{ALG_CIPHER}}, {"cfb", []int{ALG_CIPHER}}, - {"cryptd", []int{ALG_BLKCIPHER}}, + {"cryptd", []int{ALG_SKCIPHER}}, {"ctr", []int{ALG_CIPHER}}, - {"cts", []int{ALG_BLKCIPHER}}, + {"cts", []int{ALG_SKCIPHER}}, {"ecb", []int{ALG_CIPHER}}, - {"essiv", []int{ALG_BLKCIPHER, ALG_HASH}}, - {"fpu", []int{ALG_BLKCIPHER}}, + {"essiv", []int{ALG_SKCIPHER, ALG_HASH}}, + {"fpu", []int{ALG_SKCIPHER}}, {"kw", []int{ALG_CIPHER}}, - {"lrw", []int{ALG_BLKCIPHER}}, + {"lrw", []int{ALG_SKCIPHER}}, {"lrw", []int{ALG_CIPHER}}, {"ofb", []int{ALG_CIPHER}}, {"pcbc", []int{ALG_CIPHER}}, - {"rfc3686", []int{ALG_BLKCIPHER}}, - {"xts", []int{ALG_BLKCIPHER}}, + {"rfc3686", []int{ALG_SKCIPHER}}, + {"xts", []int{ALG_SKCIPHER}}, {"xts", []int{ALG_CIPHER}}, // algorithms: diff --git a/sys/linux/smack.txt b/sys/linux/smack.txt index 8ae5474e1..ebde4e5aa 100644 --- a/sys/linux/smack.txt +++ b/sys/linux/smack.txt @@ -1,6 +1,7 @@ # Copyright 2018 syzkaller project authors. All rights reserved. # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +include <uapi/linux/fcntl.h> include <security/smack/smack.h> resource fd_smack_current[fd] diff --git a/sys/linux/socket_alg.txt b/sys/linux/socket_alg.txt index bcbc7edb6..f53437587 100644 --- a/sys/linux/socket_alg.txt +++ b/sys/linux/socket_alg.txt @@ -46,7 +46,7 @@ alg_hash_name { } # Special struct generated by Go code. -alg_blkcipher_name { +alg_skcipher_name { name string["filled later", 64] } @@ -95,7 +95,7 @@ cmsghdr_alg_assoc { assoc int32 } [align_ptr] -af_alg_type = CRYPTO_ALG_TYPE_MASK, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_COMPRESS, CRYPTO_ALG_TYPE_AEAD, CRYPTO_ALG_TYPE_BLKCIPHER, CRYPTO_ALG_TYPE_ABLKCIPHER, CRYPTO_ALG_TYPE_HASH, CRYPTO_ALG_TYPE_SHASH, CRYPTO_ALG_TYPE_AHASH, CRYPTO_ALG_TYPE_RNG, CRYPTO_ALG_TYPE_AKCIPHER, CRYPTO_ALG_TYPE_PCOMPRESS, CRYPTO_ALG_LARVAL, CRYPTO_ALG_DEAD, CRYPTO_ALG_DYING, CRYPTO_ALG_ASYNC, CRYPTO_ALG_NEED_FALLBACK, CRYPTO_ALG_TESTED, CRYPTO_ALG_INSTANCE, CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_INTERNAL +af_alg_type = CRYPTO_ALG_TYPE_MASK, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_COMPRESS, CRYPTO_ALG_TYPE_AEAD, CRYPTO_ALG_TYPE_SKCIPHER, CRYPTO_ALG_TYPE_HASH, CRYPTO_ALG_TYPE_SHASH, CRYPTO_ALG_TYPE_AHASH, CRYPTO_ALG_TYPE_RNG, CRYPTO_ALG_TYPE_AKCIPHER, CRYPTO_ALG_TYPE_PCOMPRESS, CRYPTO_ALG_LARVAL, CRYPTO_ALG_DEAD, CRYPTO_ALG_DYING, CRYPTO_ALG_ASYNC, CRYPTO_ALG_NEED_FALLBACK, CRYPTO_ALG_TESTED, CRYPTO_ALG_INSTANCE, CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_INTERNAL alg_op_op = ALG_OP_DECRYPT, ALG_OP_ENCRYPT diff --git a/sys/linux/socket_alg_386.const b/sys/linux/socket_alg_386.const index 6369aa29d..05adebad5 100644 --- a/sys/linux/socket_alg_386.const +++ b/sys/linux/socket_alg_386.const @@ -16,11 +16,9 @@ CRYPTO_ALG_KERN_DRIVER_ONLY = 4096 CRYPTO_ALG_LARVAL = 16 CRYPTO_ALG_NEED_FALLBACK = 256 CRYPTO_ALG_TESTED = 1024 -CRYPTO_ALG_TYPE_ABLKCIPHER = 5 CRYPTO_ALG_TYPE_AEAD = 3 CRYPTO_ALG_TYPE_AHASH = 15 CRYPTO_ALG_TYPE_AKCIPHER = 13 -CRYPTO_ALG_TYPE_BLKCIPHER = 4 CRYPTO_ALG_TYPE_CIPHER = 1 CRYPTO_ALG_TYPE_COMPRESS = 2 CRYPTO_ALG_TYPE_HASH = 14 @@ -28,6 +26,7 @@ CRYPTO_ALG_TYPE_MASK = 15 CRYPTO_ALG_TYPE_PCOMPRESS = 15 CRYPTO_ALG_TYPE_RNG = 12 CRYPTO_ALG_TYPE_SHASH = 14 +CRYPTO_ALG_TYPE_SKCIPHER = 5 SOCK_SEQPACKET = 5 SOL_ALG = 279 # __NR_accept is not set diff --git a/sys/linux/socket_alg_amd64.const b/sys/linux/socket_alg_amd64.const index 2ae3eec89..3a47824b0 100644 --- a/sys/linux/socket_alg_amd64.const +++ b/sys/linux/socket_alg_amd64.const @@ -16,11 +16,9 @@ CRYPTO_ALG_KERN_DRIVER_ONLY = 4096 CRYPTO_ALG_LARVAL = 16 CRYPTO_ALG_NEED_FALLBACK = 256 CRYPTO_ALG_TESTED = 1024 -CRYPTO_ALG_TYPE_ABLKCIPHER = 5 CRYPTO_ALG_TYPE_AEAD = 3 CRYPTO_ALG_TYPE_AHASH = 15 CRYPTO_ALG_TYPE_AKCIPHER = 13 -CRYPTO_ALG_TYPE_BLKCIPHER = 4 CRYPTO_ALG_TYPE_CIPHER = 1 CRYPTO_ALG_TYPE_COMPRESS = 2 CRYPTO_ALG_TYPE_HASH = 14 @@ -28,6 +26,7 @@ CRYPTO_ALG_TYPE_MASK = 15 CRYPTO_ALG_TYPE_PCOMPRESS = 15 CRYPTO_ALG_TYPE_RNG = 12 CRYPTO_ALG_TYPE_SHASH = 14 +CRYPTO_ALG_TYPE_SKCIPHER = 5 SOCK_SEQPACKET = 5 SOL_ALG = 279 __NR_accept = 43 diff --git a/sys/linux/socket_alg_arm.const b/sys/linux/socket_alg_arm.const index 67bbea323..32030d46d 100644 --- a/sys/linux/socket_alg_arm.const +++ b/sys/linux/socket_alg_arm.const @@ -16,11 +16,9 @@ CRYPTO_ALG_KERN_DRIVER_ONLY = 4096 CRYPTO_ALG_LARVAL = 16 CRYPTO_ALG_NEED_FALLBACK = 256 CRYPTO_ALG_TESTED = 1024 -CRYPTO_ALG_TYPE_ABLKCIPHER = 5 CRYPTO_ALG_TYPE_AEAD = 3 CRYPTO_ALG_TYPE_AHASH = 15 CRYPTO_ALG_TYPE_AKCIPHER = 13 -CRYPTO_ALG_TYPE_BLKCIPHER = 4 CRYPTO_ALG_TYPE_CIPHER = 1 CRYPTO_ALG_TYPE_COMPRESS = 2 CRYPTO_ALG_TYPE_HASH = 14 @@ -28,6 +26,7 @@ CRYPTO_ALG_TYPE_MASK = 15 CRYPTO_ALG_TYPE_PCOMPRESS = 15 CRYPTO_ALG_TYPE_RNG = 12 CRYPTO_ALG_TYPE_SHASH = 14 +CRYPTO_ALG_TYPE_SKCIPHER = 5 SOCK_SEQPACKET = 5 SOL_ALG = 279 __NR_accept = 285 diff --git a/sys/linux/socket_alg_arm64.const b/sys/linux/socket_alg_arm64.const index bb39b57a3..fca35053d 100644 --- a/sys/linux/socket_alg_arm64.const +++ b/sys/linux/socket_alg_arm64.const @@ -16,11 +16,9 @@ CRYPTO_ALG_KERN_DRIVER_ONLY = 4096 CRYPTO_ALG_LARVAL = 16 CRYPTO_ALG_NEED_FALLBACK = 256 CRYPTO_ALG_TESTED = 1024 -CRYPTO_ALG_TYPE_ABLKCIPHER = 5 CRYPTO_ALG_TYPE_AEAD = 3 CRYPTO_ALG_TYPE_AHASH = 15 CRYPTO_ALG_TYPE_AKCIPHER = 13 -CRYPTO_ALG_TYPE_BLKCIPHER = 4 CRYPTO_ALG_TYPE_CIPHER = 1 CRYPTO_ALG_TYPE_COMPRESS = 2 CRYPTO_ALG_TYPE_HASH = 14 @@ -28,6 +26,7 @@ CRYPTO_ALG_TYPE_MASK = 15 CRYPTO_ALG_TYPE_PCOMPRESS = 15 CRYPTO_ALG_TYPE_RNG = 12 CRYPTO_ALG_TYPE_SHASH = 14 +CRYPTO_ALG_TYPE_SKCIPHER = 5 SOCK_SEQPACKET = 5 SOL_ALG = 279 __NR_accept = 202 diff --git a/sys/linux/socket_alg_ppc64le.const b/sys/linux/socket_alg_ppc64le.const index b8966eb2d..f29dbcf0e 100644 --- a/sys/linux/socket_alg_ppc64le.const +++ b/sys/linux/socket_alg_ppc64le.const @@ -16,11 +16,9 @@ CRYPTO_ALG_KERN_DRIVER_ONLY = 4096 CRYPTO_ALG_LARVAL = 16 CRYPTO_ALG_NEED_FALLBACK = 256 CRYPTO_ALG_TESTED = 1024 -CRYPTO_ALG_TYPE_ABLKCIPHER = 5 CRYPTO_ALG_TYPE_AEAD = 3 CRYPTO_ALG_TYPE_AHASH = 15 CRYPTO_ALG_TYPE_AKCIPHER = 13 -CRYPTO_ALG_TYPE_BLKCIPHER = 4 CRYPTO_ALG_TYPE_CIPHER = 1 CRYPTO_ALG_TYPE_COMPRESS = 2 CRYPTO_ALG_TYPE_HASH = 14 @@ -28,6 +26,7 @@ CRYPTO_ALG_TYPE_MASK = 15 CRYPTO_ALG_TYPE_PCOMPRESS = 15 CRYPTO_ALG_TYPE_RNG = 12 CRYPTO_ALG_TYPE_SHASH = 14 +CRYPTO_ALG_TYPE_SKCIPHER = 5 SOCK_SEQPACKET = 5 SOL_ALG = 279 __NR_accept = 330 diff --git a/sys/linux/socket_netlink_generic_devlink_386.const b/sys/linux/socket_netlink_generic_devlink_386.const index ba4abcbed..ea80dd3c8 100644 --- a/sys/linux/socket_netlink_generic_devlink_386.const +++ b/sys/linux/socket_netlink_generic_devlink_386.const @@ -1,9 +1,9 @@ # AUTOGENERATED FILE DEVLINK_ATTR_BUS_NAME = 1 DEVLINK_ATTR_DEV_NAME = 2 -DEVLINK_ATTR_NETNS_FD = 137 -DEVLINK_ATTR_NETNS_ID = 139 -DEVLINK_ATTR_NETNS_PID = 138 +DEVLINK_ATTR_NETNS_FD = 138 +DEVLINK_ATTR_NETNS_ID = 140 +DEVLINK_ATTR_NETNS_PID = 139 DEVLINK_ATTR_PORT_INDEX = 3 DEVLINK_ATTR_PORT_TYPE = 4 DEVLINK_CMD_GET = 1 diff --git a/sys/linux/socket_netlink_generic_devlink_amd64.const b/sys/linux/socket_netlink_generic_devlink_amd64.const index 7af7b44e6..2f4ef45cb 100644 --- a/sys/linux/socket_netlink_generic_devlink_amd64.const +++ b/sys/linux/socket_netlink_generic_devlink_amd64.const @@ -1,9 +1,9 @@ # AUTOGENERATED FILE DEVLINK_ATTR_BUS_NAME = 1 DEVLINK_ATTR_DEV_NAME = 2 -DEVLINK_ATTR_NETNS_FD = 137 -DEVLINK_ATTR_NETNS_ID = 139 -DEVLINK_ATTR_NETNS_PID = 138 +DEVLINK_ATTR_NETNS_FD = 138 +DEVLINK_ATTR_NETNS_ID = 140 +DEVLINK_ATTR_NETNS_PID = 139 DEVLINK_ATTR_PORT_INDEX = 3 DEVLINK_ATTR_PORT_TYPE = 4 DEVLINK_CMD_GET = 1 diff --git a/sys/linux/socket_netlink_generic_devlink_arm.const b/sys/linux/socket_netlink_generic_devlink_arm.const index be4de29c3..2d9319966 100644 --- a/sys/linux/socket_netlink_generic_devlink_arm.const +++ b/sys/linux/socket_netlink_generic_devlink_arm.const @@ -1,9 +1,9 @@ # AUTOGENERATED FILE DEVLINK_ATTR_BUS_NAME = 1 DEVLINK_ATTR_DEV_NAME = 2 -DEVLINK_ATTR_NETNS_FD = 137 -DEVLINK_ATTR_NETNS_ID = 139 -DEVLINK_ATTR_NETNS_PID = 138 +DEVLINK_ATTR_NETNS_FD = 138 +DEVLINK_ATTR_NETNS_ID = 140 +DEVLINK_ATTR_NETNS_PID = 139 DEVLINK_ATTR_PORT_INDEX = 3 DEVLINK_ATTR_PORT_TYPE = 4 DEVLINK_CMD_GET = 1 diff --git a/sys/linux/socket_netlink_generic_devlink_arm64.const b/sys/linux/socket_netlink_generic_devlink_arm64.const index 74882e7ce..81288b328 100644 --- a/sys/linux/socket_netlink_generic_devlink_arm64.const +++ b/sys/linux/socket_netlink_generic_devlink_arm64.const @@ -1,9 +1,9 @@ # AUTOGENERATED FILE DEVLINK_ATTR_BUS_NAME = 1 DEVLINK_ATTR_DEV_NAME = 2 -DEVLINK_ATTR_NETNS_FD = 137 -DEVLINK_ATTR_NETNS_ID = 139 -DEVLINK_ATTR_NETNS_PID = 138 +DEVLINK_ATTR_NETNS_FD = 138 +DEVLINK_ATTR_NETNS_ID = 140 +DEVLINK_ATTR_NETNS_PID = 139 DEVLINK_ATTR_PORT_INDEX = 3 DEVLINK_ATTR_PORT_TYPE = 4 DEVLINK_CMD_GET = 1 diff --git a/sys/linux/socket_netlink_generic_devlink_ppc64le.const b/sys/linux/socket_netlink_generic_devlink_ppc64le.const index 3bda45255..760621c41 100644 --- a/sys/linux/socket_netlink_generic_devlink_ppc64le.const +++ b/sys/linux/socket_netlink_generic_devlink_ppc64le.const @@ -1,9 +1,9 @@ # AUTOGENERATED FILE DEVLINK_ATTR_BUS_NAME = 1 DEVLINK_ATTR_DEV_NAME = 2 -DEVLINK_ATTR_NETNS_FD = 137 -DEVLINK_ATTR_NETNS_ID = 139 -DEVLINK_ATTR_NETNS_PID = 138 +DEVLINK_ATTR_NETNS_FD = 138 +DEVLINK_ATTR_NETNS_ID = 140 +DEVLINK_ATTR_NETNS_PID = 139 DEVLINK_ATTR_PORT_INDEX = 3 DEVLINK_ATTR_PORT_TYPE = 4 DEVLINK_CMD_GET = 1 diff --git a/sys/linux/socket_netlink_xfrm.txt b/sys/linux/socket_netlink_xfrm.txt index f788bda48..e11f4ee62 100644 --- a/sys/linux/socket_netlink_xfrm.txt +++ b/sys/linux/socket_netlink_xfrm.txt @@ -124,7 +124,7 @@ xfrm_attrs [ algo_auth_trunc nlattr[XFRMA_ALG_AUTH_TRUNC, xfrm_algo_auth] algo_aead nlattr[XFRMA_ALG_AEAD, xfrm_algo_aead] algo_auth nlattr[XFRMA_ALG_AUTH, xfrm_algo_hash] - algo_crypt nlattr[XFRMA_ALG_CRYPT, xfrm_algo_blkcipher] + algo_crypt nlattr[XFRMA_ALG_CRYPT, xfrm_algo_skcipher] algo_comp nlattr[XFRMA_ALG_COMP, xfrm_algo_compress] srcaddr nlattr[XFRMA_SRCADDR, xfrm_address] coaddr nlattr[XFRMA_COADDR, xfrm_address] @@ -284,8 +284,8 @@ xfrm_algo_hash { alg_key array[int8] } -xfrm_algo_blkcipher { - alg_name alg_blkcipher_name +xfrm_algo_skcipher { + alg_name alg_skcipher_name alg_key_len bitsize[alg_key, int32] alg_key array[int8] } diff --git a/sys/linux/sys_ppc64le.const b/sys/linux/sys_ppc64le.const index 6bf815ca5..9a1b9f553 100644 --- a/sys/linux/sys_ppc64le.const +++ b/sys/linux/sys_ppc64le.const @@ -174,7 +174,7 @@ KCMP_VM = 1 KCOV_DISABLE = 536896357 KCOV_ENABLE = 536896356 KCOV_INIT_TRACE = 1074291457 -KCOV_REMOTE_ENABLE = 1075340134 +KCOV_REMOTE_ENABLE = 2149081958 KCOV_TRACE_CMP = 1 KCOV_TRACE_PC = 0 KEXEC_ARCH_386 = 196608 diff --git a/sys/syz-extract/linux.go b/sys/syz-extract/linux.go index c5932e30b..b57375b55 100644 --- a/sys/syz-extract/linux.go +++ b/sys/syz-extract/linux.go @@ -90,7 +90,11 @@ func (*linux) prepareArch(arch *Arch) error { "-e", "NETFILTER", // include/net/mptcp.h is the only header in kernel that guards some // of the consts with own config, so we need to enable CONFIG_MPTCP. - "-e", "MPTCP") + "-e", "MPTCP", + // security/smack/smack.h requires this to build. + "-e", "SECURITY", + "-e", "SECURITY_SMACK", + ) if err != nil { return err } |
