From 4d1ab643be2091f794ec55d83ec8acf7b0a60be3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 11 Feb 2020 15:12:17 +0100 Subject: sys/linux: restrict wireguard allowedips cidr size By keeping this small, it means much greater probability that a randomly generated packet that hits xmit will match an existing peer. --- executor/defs.h | 12 ++++++------ sys/linux/gen/386.go | 17 +++++------------ sys/linux/gen/amd64.go | 17 +++++------------ sys/linux/gen/arm.go | 17 +++++------------ sys/linux/gen/arm64.go | 17 +++++------------ sys/linux/gen/mips64le.go | 17 +++++------------ sys/linux/gen/ppc64le.go | 17 +++++------------ sys/linux/socket_netlink_generic_wireguard.txt | 4 ++-- 8 files changed, 38 insertions(+), 80 deletions(-) diff --git a/executor/defs.h b/executor/defs.h index 2fecf91d1..0ae0562fa 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "56678b79e4057235cf9cdf2154dbdb3c7344b505" +#define SYZ_REVISION "a330eb991a89891be213b8410f9ab61181b57279" #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 "5abe030c28213a0f6e256ea83e3a72f176332745" +#define SYZ_REVISION "20bd3756392f94e618d15b66b3ffff7ef456aa60" #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 "da12893c663eea7840c04b6e91ab7d002f7a3c8a" +#define SYZ_REVISION "26b1c2bf6d99937d3b7ee7b97bb38a9c23c980f7" #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 "6086f6f353a21ab375b1a8c6b219e200e8f58a84" +#define SYZ_REVISION "f36c17a8f3b9fddffe4d574e3f0565e58c2a8af6" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -110,7 +110,7 @@ #if GOARCH_mips64le #define GOARCH "mips64le" -#define SYZ_REVISION "9b9002bc4f823c80760d41d0852e00fd90666fc6" +#define SYZ_REVISION "2ea614e13317d13261c2a01d6f1f9c9303d833f9" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -120,7 +120,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "7a5d43c75dcc4537aed13ba7b3c920c33d38f89c" +#define SYZ_REVISION "d045943d77a6944c4a4614d8101217cbdae76ac1" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index 6fc8564d3..2e4851b42 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -413,12 +413,12 @@ var structDescs_386 = []*KeyedStruct{ {StructKey{Name: "allowedip_policy_ipv4"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv4", TypeSize: 24}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv4_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "allowedip_policy_ipv6"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv6", TypeSize: 36}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET6, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv6_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "apparmor_current_attr"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "apparmor_current_attr", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "apparmor_current_hat"}, FldName: "hat"}, @@ -30466,17 +30466,10 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "peer_info"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]", TypeSize: 8}, []Type{ + {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]", TypeSize: 8}, []Type{ &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 128}, - &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]", TypeSize: 8}, []Type{ - &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 32}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 3}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }, 4}}, @@ -75767,4 +75760,4 @@ var consts_386 = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_386 = "56678b79e4057235cf9cdf2154dbdb3c7344b505" +const revision_386 = "a330eb991a89891be213b8410f9ab61181b57279" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index 6bcffca22..e488954d1 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -415,12 +415,12 @@ var structDescs_amd64 = []*KeyedStruct{ {StructKey{Name: "allowedip_policy_ipv4"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv4", TypeSize: 24}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv4_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "allowedip_policy_ipv6"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv6", TypeSize: 36}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET6, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv6_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "apparmor_current_attr"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "apparmor_current_attr", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "apparmor_current_hat"}, FldName: "hat"}, @@ -31142,17 +31142,10 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "peer_info"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]", TypeSize: 8}, []Type{ + {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]", TypeSize: 8}, []Type{ &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 128}, - &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]", TypeSize: 8}, []Type{ - &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 32}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 3}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }, 4}}, @@ -76727,4 +76720,4 @@ var consts_amd64 = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_amd64 = "5abe030c28213a0f6e256ea83e3a72f176332745" +const revision_amd64 = "20bd3756392f94e618d15b66b3ffff7ef456aa60" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index 3cfe6ed5c..fde2fc825 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -414,12 +414,12 @@ var structDescs_arm = []*KeyedStruct{ {StructKey{Name: "allowedip_policy_ipv4"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv4", TypeSize: 24}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv4_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "allowedip_policy_ipv6"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv6", TypeSize: 36}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET6, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv6_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "apparmor_current_attr"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "apparmor_current_attr", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "apparmor_current_hat"}, FldName: "hat"}, @@ -30327,17 +30327,10 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "peer_info"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]", TypeSize: 8}, []Type{ + {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]", TypeSize: 8}, []Type{ &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 128}, - &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]", TypeSize: 8}, []Type{ - &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 32}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 3}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }, 4}}, @@ -75419,4 +75412,4 @@ var consts_arm = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_arm = "da12893c663eea7840c04b6e91ab7d002f7a3c8a" +const revision_arm = "26b1c2bf6d99937d3b7ee7b97bb38a9c23c980f7" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 13650407f..ddc474545 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -415,12 +415,12 @@ var structDescs_arm64 = []*KeyedStruct{ {StructKey{Name: "allowedip_policy_ipv4"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv4", TypeSize: 24}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv4_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "allowedip_policy_ipv6"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv6", TypeSize: 36}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET6, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv6_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "apparmor_current_attr"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "apparmor_current_attr", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "apparmor_current_hat"}, FldName: "hat"}, @@ -30951,17 +30951,10 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "peer_info"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]", TypeSize: 8}, []Type{ + {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]", TypeSize: 8}, []Type{ &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 128}, - &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]", TypeSize: 8}, []Type{ - &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 32}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 3}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }, 4}}, @@ -76072,4 +76065,4 @@ var consts_arm64 = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_arm64 = "6086f6f353a21ab375b1a8c6b219e200e8f58a84" +const revision_arm64 = "f36c17a8f3b9fddffe4d574e3f0565e58c2a8af6" diff --git a/sys/linux/gen/mips64le.go b/sys/linux/gen/mips64le.go index 3c4a40552..0c2974391 100644 --- a/sys/linux/gen/mips64le.go +++ b/sys/linux/gen/mips64le.go @@ -412,12 +412,12 @@ var structDescs_mips64le = []*KeyedStruct{ {StructKey{Name: "allowedip_policy_ipv4"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv4", TypeSize: 24}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv4_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "allowedip_policy_ipv6"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv6", TypeSize: 36}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET6, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv6_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "apparmor_current_attr"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "apparmor_current_attr", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "apparmor_current_hat"}, FldName: "hat"}, @@ -30895,17 +30895,10 @@ var structDescs_mips64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "peer_info"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]", TypeSize: 8}, []Type{ + {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]", TypeSize: 8}, []Type{ &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 128}, - &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]", TypeSize: 8}, []Type{ - &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 32}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 3}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }, 4}}, @@ -73733,4 +73726,4 @@ var consts_mips64le = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_mips64le = "9b9002bc4f823c80760d41d0852e00fd90666fc6" +const revision_mips64le = "2ea614e13317d13261c2a01d6f1f9c9303d833f9" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index bc83bfe4d..250be686c 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -414,12 +414,12 @@ var structDescs_ppc64le = []*KeyedStruct{ {StructKey{Name: "allowedip_policy_ipv4"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv4", TypeSize: 24}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv4_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "allowedip_policy_ipv6"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "allowedip_policy_ipv6", TypeSize: 36}, Fields: []Type{ &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_FAMILY, int16], const[AF_INET6, int16]]"}, FldName: "WGALLOWEDIP_A_FAMILY"}, &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_IPADDR, int16], ipv6_addr]"}, FldName: "WGALLOWEDIP_A_IPADDR"}, - &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, + &StructType{Key: StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, FldName: "WGALLOWEDIP_A_CIDR_MASK"}, }}}, {StructKey{Name: "apparmor_current_attr"}, &StructDesc{TypeCommon: TypeCommon{TypeName: "apparmor_current_attr", IsVarlen: true}, Fields: []Type{ &StructType{Key: StructKey{Name: "apparmor_current_hat"}, FldName: "hat"}, @@ -30897,17 +30897,10 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "peer_info"}, FldName: "payload"}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:128]]", TypeSize: 8}, []Type{ + {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:3]]", TypeSize: 8}, []Type{ &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 128}, - &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, - }, 4}}, - {StructKey{Name: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]"}, &StructDesc{TypeCommon{TypeName: "nlattr_t[const[WGALLOWEDIP_A_CIDR_MASK, int16], int8[0:32]]", TypeSize: 8}, []Type{ - &LenType{IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "nla_len", TypeSize: 2}}, 8, true, []string{"size"}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "nla_type", TypeSize: 2}}, Val: 3}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 32}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "payload", TypeSize: 1}}, Kind: 1, RangeEnd: 3}, &BufferType{TypeCommon: TypeCommon{TypeName: "void", FldName: "size"}, Kind: 1}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true}, }, 4}}, @@ -76069,4 +76062,4 @@ var consts_ppc64le = []ConstValue{ {"ethtool_per_queue_op_size", 128}, } -const revision_ppc64le = "7a5d43c75dcc4537aed13ba7b3c920c33d38f89c" +const revision_ppc64le = "d045943d77a6944c4a4614d8101217cbdae76ac1" diff --git a/sys/linux/socket_netlink_generic_wireguard.txt b/sys/linux/socket_netlink_generic_wireguard.txt index 325cc07df..54b8720c8 100644 --- a/sys/linux/socket_netlink_generic_wireguard.txt +++ b/sys/linux/socket_netlink_generic_wireguard.txt @@ -49,13 +49,13 @@ allowedip_policy [ allowedip_policy_ipv4 { WGALLOWEDIP_A_FAMILY nlattr[WGALLOWEDIP_A_FAMILY, const[AF_INET, int16]] WGALLOWEDIP_A_IPADDR nlattr[WGALLOWEDIP_A_IPADDR, ipv4_addr] - WGALLOWEDIP_A_CIDR_MASK nlattr[WGALLOWEDIP_A_CIDR_MASK, int8[0:32]] + WGALLOWEDIP_A_CIDR_MASK nlattr[WGALLOWEDIP_A_CIDR_MASK, int8[0:3]] } [packed] allowedip_policy_ipv6 { WGALLOWEDIP_A_FAMILY nlattr[WGALLOWEDIP_A_FAMILY, const[AF_INET6, int16]] WGALLOWEDIP_A_IPADDR nlattr[WGALLOWEDIP_A_IPADDR, ipv6_addr] - WGALLOWEDIP_A_CIDR_MASK nlattr[WGALLOWEDIP_A_CIDR_MASK, int8[0:128]] + WGALLOWEDIP_A_CIDR_MASK nlattr[WGALLOWEDIP_A_CIDR_MASK, int8[0:3]] } [packed] wireguard_private_key [ -- cgit mrf-deployment