sys/linux: check for missing/duplicate netlink attrs

Update #590
google · Jan 23, 2020 · 9ab9b32 · 9ab9b32
1 parent 46961c2
commit 9ab9b32
Show file tree

Hide file tree

Showing 77 changed files with 2,462 additions and 1,213 deletions.
diff --git a/executor/defs.h b/executor/defs.h
diff --git a/sys/linux/dev_nbd.txt.warn b/sys/linux/dev_nbd.txt.warn
@@ -1 +1,2 @@
+bad-netlink-attr: nbd_attr_policy: missing attributes: [9]
 no-such-struct: nbd_sock_pair
diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
diff --git a/sys/linux/gen/mips64le.go b/sys/linux/gen/mips64le.go
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
diff --git a/sys/linux/ipvs.txt b/sys/linux/ipvs.txt
@@ -98,6 +98,7 @@ ip_vs_dest_policy [
 	IPVS_DEST_ATTR_ADDR_FAMILY	nlattr[IPVS_DEST_ATTR_ADDR_FAMILY, flags[ip_vs_af, int16]]
 	IPVS_DEST_ATTR_TUN_TYPE		nlattr[IPVS_DEST_ATTR_TUN_TYPE, flags[ipvs_tun_type, int8]]
 	IPVS_DEST_ATTR_TUN_PORT		nlattr[IPVS_DEST_ATTR_TUN_PORT, sock_port]
+	IPVS_DEST_ATTR_TUN_FLAGS	nlattr[IPVS_DEST_ATTR_TUN_FLAGS, int16]
 ] [varlen]
 
 ipvs_tun_type = IP_VS_CONN_F_TUNNEL_TYPE_IPIP, IP_VS_CONN_F_TUNNEL_TYPE_GUE

diff --git a/sys/linux/ipvs.txt.warn b/sys/linux/ipvs.txt.warn
@@ -1 +1,3 @@
+bad-netlink-attr: ip_vs_svc_policy: missing attributes: [10]
+bad-netlink-attr: ip_vs_dest_policy: missing attributes: [10]
 no-such-struct: ip_vs_svcdest_user
diff --git a/sys/linux/ipvs_386.const b/sys/linux/ipvs_386.const
@@ -41,6 +41,7 @@ IPVS_DEST_ATTR_INACT_CONNS = 8
 IPVS_DEST_ATTR_L_THRESH = 6
 IPVS_DEST_ATTR_PERSIST_CONNS = 9
 IPVS_DEST_ATTR_PORT = 2
+IPVS_DEST_ATTR_TUN_FLAGS = 15
 IPVS_DEST_ATTR_TUN_PORT = 14
 IPVS_DEST_ATTR_TUN_TYPE = 13
 IPVS_DEST_ATTR_U_THRESH = 5

diff --git a/sys/linux/ipvs_amd64.const b/sys/linux/ipvs_amd64.const
@@ -41,6 +41,7 @@ IPVS_DEST_ATTR_INACT_CONNS = 8
 IPVS_DEST_ATTR_L_THRESH = 6
 IPVS_DEST_ATTR_PERSIST_CONNS = 9
 IPVS_DEST_ATTR_PORT = 2
+IPVS_DEST_ATTR_TUN_FLAGS = 15
 IPVS_DEST_ATTR_TUN_PORT = 14
 IPVS_DEST_ATTR_TUN_TYPE = 13
 IPVS_DEST_ATTR_U_THRESH = 5

diff --git a/sys/linux/ipvs_arm.const b/sys/linux/ipvs_arm.const
@@ -41,6 +41,7 @@ IPVS_DEST_ATTR_INACT_CONNS = 8
 IPVS_DEST_ATTR_L_THRESH = 6
 IPVS_DEST_ATTR_PERSIST_CONNS = 9
 IPVS_DEST_ATTR_PORT = 2
+IPVS_DEST_ATTR_TUN_FLAGS = 15
 IPVS_DEST_ATTR_TUN_PORT = 14
 IPVS_DEST_ATTR_TUN_TYPE = 13
 IPVS_DEST_ATTR_U_THRESH = 5

diff --git a/sys/linux/ipvs_arm64.const b/sys/linux/ipvs_arm64.const
@@ -41,6 +41,7 @@ IPVS_DEST_ATTR_INACT_CONNS = 8
 IPVS_DEST_ATTR_L_THRESH = 6
 IPVS_DEST_ATTR_PERSIST_CONNS = 9
 IPVS_DEST_ATTR_PORT = 2
+IPVS_DEST_ATTR_TUN_FLAGS = 15
 IPVS_DEST_ATTR_TUN_PORT = 14
 IPVS_DEST_ATTR_TUN_TYPE = 13
 IPVS_DEST_ATTR_U_THRESH = 5

diff --git a/sys/linux/ipvs_mips64le.const b/sys/linux/ipvs_mips64le.const
@@ -41,6 +41,7 @@ IPVS_DEST_ATTR_INACT_CONNS = 8
 IPVS_DEST_ATTR_L_THRESH = 6
 IPVS_DEST_ATTR_PERSIST_CONNS = 9
 IPVS_DEST_ATTR_PORT = 2
+IPVS_DEST_ATTR_TUN_FLAGS = 15
 IPVS_DEST_ATTR_TUN_PORT = 14
 IPVS_DEST_ATTR_TUN_TYPE = 13
 IPVS_DEST_ATTR_U_THRESH = 5

diff --git a/sys/linux/ipvs_ppc64le.const b/sys/linux/ipvs_ppc64le.const
@@ -41,6 +41,7 @@ IPVS_DEST_ATTR_INACT_CONNS = 8
 IPVS_DEST_ATTR_L_THRESH = 6
 IPVS_DEST_ATTR_PERSIST_CONNS = 9
 IPVS_DEST_ATTR_PORT = 2
+IPVS_DEST_ATTR_TUN_FLAGS = 15
 IPVS_DEST_ATTR_TUN_PORT = 14
 IPVS_DEST_ATTR_TUN_TYPE = 13
 IPVS_DEST_ATTR_U_THRESH = 5

diff --git a/sys/linux/socket_inet_l2tp.txt.warn b/sys/linux/socket_inet_l2tp.txt.warn
@@ -1 +1,2 @@
+bad-netlink-attr: l2tp_nl_policy: missing attributes: [21 30]
 no-such-struct: l2tp_tunnel_fd
diff --git a/sys/linux/socket_netlink_generic_80211.txt b/sys/linux/socket_netlink_generic_80211.txt
@@ -259,6 +259,7 @@ sta_flags_policy [
 	NL80211_STA_FLAG_MFP		nlattr[NL80211_STA_FLAG_MFP, void]
 	NL80211_STA_FLAG_AUTHENTICATED	nlattr[NL80211_STA_FLAG_AUTHENTICATED, void]
 	NL80211_STA_FLAG_TDLS_PEER	nlattr[NL80211_STA_FLAG_TDLS_PEER, void]
+	NL80211_STA_FLAG_ASSOCIATED	nlattr[NL80211_STA_FLAG_ASSOCIATED, void]
 ] [varlen]
 
 nl80211_sta_flag_update {

diff --git a/sys/linux/socket_netlink_generic_80211.txt.warn b/sys/linux/socket_netlink_generic_80211.txt.warn
@@ -1,3 +1,5 @@
 no-such-struct: nl80211_wdev
+bad-netlink-attr: nl80211_policy_cmd_key.NL80211_ATTR_KEY_DATA_WEP104: duplicate attribute
+bad-netlink-attr: nl80211_key_policy.NL80211_KEY_DATA_WEP104: duplicate attribute
 no-such-netlink-policy: nl80211_tx_rates_policy
 no-such-netlink-policy: nl80211_rates_policy
diff --git a/sys/linux/socket_netlink_generic_80211_386.const b/sys/linux/socket_netlink_generic_80211_386.const
@@ -259,6 +259,7 @@ NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI = 6
 NL80211_SMPS_DYNAMIC = 2
 NL80211_SMPS_OFF = 0
 NL80211_SMPS_STATIC = 1
+NL80211_STA_FLAG_ASSOCIATED = 7
 NL80211_STA_FLAG_AUTHENTICATED = 5
 NL80211_STA_FLAG_AUTHORIZED = 1
 NL80211_STA_FLAG_MFP = 4

diff --git a/sys/linux/socket_netlink_generic_80211_amd64.const b/sys/linux/socket_netlink_generic_80211_amd64.const
@@ -259,6 +259,7 @@ NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI = 6
 NL80211_SMPS_DYNAMIC = 2
 NL80211_SMPS_OFF = 0
 NL80211_SMPS_STATIC = 1
+NL80211_STA_FLAG_ASSOCIATED = 7
 NL80211_STA_FLAG_AUTHENTICATED = 5
 NL80211_STA_FLAG_AUTHORIZED = 1
 NL80211_STA_FLAG_MFP = 4

diff --git a/sys/linux/socket_netlink_generic_80211_arm.const b/sys/linux/socket_netlink_generic_80211_arm.const
@@ -259,6 +259,7 @@ NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI = 6
 NL80211_SMPS_DYNAMIC = 2
 NL80211_SMPS_OFF = 0
 NL80211_SMPS_STATIC = 1
+NL80211_STA_FLAG_ASSOCIATED = 7
 NL80211_STA_FLAG_AUTHENTICATED = 5
 NL80211_STA_FLAG_AUTHORIZED = 1
 NL80211_STA_FLAG_MFP = 4

diff --git a/sys/linux/socket_netlink_generic_80211_arm64.const b/sys/linux/socket_netlink_generic_80211_arm64.const
@@ -259,6 +259,7 @@ NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI = 6
 NL80211_SMPS_DYNAMIC = 2
 NL80211_SMPS_OFF = 0
 NL80211_SMPS_STATIC = 1
+NL80211_STA_FLAG_ASSOCIATED = 7
 NL80211_STA_FLAG_AUTHENTICATED = 5
 NL80211_STA_FLAG_AUTHORIZED = 1
 NL80211_STA_FLAG_MFP = 4

diff --git a/sys/linux/socket_netlink_generic_80211_mips64le.const b/sys/linux/socket_netlink_generic_80211_mips64le.const
@@ -259,6 +259,7 @@ NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI = 6
 NL80211_SMPS_DYNAMIC = 2
 NL80211_SMPS_OFF = 0
 NL80211_SMPS_STATIC = 1
+NL80211_STA_FLAG_ASSOCIATED = 7
 NL80211_STA_FLAG_AUTHENTICATED = 5
 NL80211_STA_FLAG_AUTHORIZED = 1
 NL80211_STA_FLAG_MFP = 4

diff --git a/sys/linux/socket_netlink_generic_80211_ppc64le.const b/sys/linux/socket_netlink_generic_80211_ppc64le.const
@@ -259,6 +259,7 @@ NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI = 6
 NL80211_SMPS_DYNAMIC = 2
 NL80211_SMPS_OFF = 0
 NL80211_SMPS_STATIC = 1
+NL80211_STA_FLAG_ASSOCIATED = 7
 NL80211_STA_FLAG_AUTHENTICATED = 5
 NL80211_STA_FLAG_AUTHORIZED = 1
 NL80211_STA_FLAG_MFP = 4

diff --git a/sys/linux/socket_netlink_generic_fou.txt.warn b/sys/linux/socket_netlink_generic_fou.txt.warn
@@ -0,0 +1 @@
+bad-netlink-attr: fou_nl_policy: missing attributes: [7 9]
diff --git a/sys/linux/socket_netlink_generic_netlabel.txt.warn b/sys/linux/socket_netlink_generic_netlabel.txt.warn
@@ -0,0 +1,2 @@
+bad-netlink-attr: netlbl_mgmt_genl_policy: missing attributes: [3]
+bad-netlink-attr: netlbl_cipsov4_genl_policy: missing attributes: [3 7 11]
diff --git a/sys/linux/socket_netlink_generic_seg6.txt.warn b/sys/linux/socket_netlink_generic_seg6.txt.warn
@@ -0,0 +1 @@
+bad-netlink-attr: seg6_genl_policy: missing attributes: [7]
diff --git a/sys/linux/socket_netlink_generic_team.txt.warn b/sys/linux/socket_netlink_generic_team.txt.warn
@@ -1,3 +1,5 @@
+bad-netlink-attr: team_nl_policy: missing attributes: [3]
+bad-netlink-attr: team_nl_option_policy: missing attributes: [2]
 no-such-struct: team_nl_option_policy
 no-such-struct: team_nl_option_policy_per_port
 no-such-struct: team_nl_option_policy_array
diff --git a/sys/linux/socket_netlink_netfilter_conntrack.txt b/sys/linux/socket_netlink_netfilter_conntrack.txt
@@ -25,27 +25,35 @@ sendmsg$IPCTNL_MSG_CT_GET_UNCONFIRMED(fd sock_nl_netfilter, msg ptr[in, msghdr_c
 ct_nla_policy [
 	CTA_TUPLE_ORIG		nlnest[CTA_TUPLE_ORIG, array[tuple_nla_policy]]
 	CTA_TUPLE_REPLY		nlnest[CTA_TUPLE_REPLY, array[tuple_nla_policy]]
-	CTA_STATUS		nlattr[CTA_STATUS, flags[ip_conntrack_status, int32be]]
+	CTA_STATUS		nlnetw[CTA_STATUS, flags[ip_conntrack_status, int32be]]
 	CTA_PROTOINFO		nlnest[CTA_PROTOINFO, protoinfo_policy]
 # The policy may also contain CTA_HELP_INFO, but I don't see any of the helpers use it.
 	CTA_HELP		nlnest[CTA_HELP, nlattr[CTA_HELP_NAME, string[xt_helper_names]]]
 	CTA_NAT_SRC		nlnest[CTA_NAT_SRC, array[nat_nla_policy]]
-	CTA_TIMEOUT		nlattr[CTA_TIMEOUT, int32be]
-	CTA_MARK		nlattr[CTA_MARK, int32be]
-	CTA_ID			nlattr[CTA_ID, conntrack_id]
+	CTA_TIMEOUT		nlnetw[CTA_TIMEOUT, int32be]
+	CTA_MARK		nlnetw[CTA_MARK, int32be]
+	CTA_ID			nlnetw[CTA_ID, conntrack_id]
 	CTA_NAT_DST		nlnest[CTA_NAT_DST, array[nat_nla_policy]]
 	CTA_TUPLE_MASTER	nlnest[CTA_TUPLE_MASTER, array[tuple_nla_policy]]
-	CTA_ZONE		nlattr[CTA_ZONE, conntrack_zone]
-	CTA_MARK_MASK		nlattr[CTA_MARK_MASK, conntrack_id]
-	CTA_LABELS		nlattr[CTA_LABELS, array[int32be]]
+	CTA_ZONE		nlnetw[CTA_ZONE, conntrack_zone]
+	CTA_MARK_MASK		nlnetw[CTA_MARK_MASK, conntrack_id]
+	CTA_LABELS		nlnetw[CTA_LABELS, array[int32be]]
 # NEED: CTA_LABELS_MASK should be of the same size as CTA_LABELS.
 	CTA_LABELS_MASK		nlattr[CTA_LABELS_MASK, array[int32be]]
+	CTA_SEQ_ADJ_ORIG	nlnest[CTA_SEQ_ADJ_ORIG, array[seqadj_policy]]
+	CTA_SEQ_ADJ_REPLY	nlnest[CTA_SEQ_ADJ_REPLY, array[seqadj_policy]]
+] [varlen]
+
+seqadj_policy [
+	CTA_SEQADJ_CORRECTION_POS	nlnetw[CTA_SEQADJ_CORRECTION_POS, int32be]
+	CTA_SEQADJ_OFFSET_BEFORE	nlnetw[CTA_SEQADJ_OFFSET_BEFORE, int32be]
+	CTA_SEQADJ_OFFSET_AFTER		nlnetw[CTA_SEQADJ_OFFSET_AFTER, int32be]
 ] [varlen]
 
 tuple_nla_policy [
 	CTA_TUPLE_IP	nlnest[CTA_TUPLE_IP, cta_ip_nla_policy]
 	CTA_TUPLE_PROTO	nlnest[CTA_TUPLE_PROTO, nlattr[CTA_PROTO_NUM, flags[conntrack_proto, int8]]]
-	CTA_TUPLE_ZONE	nlattr[CTA_TUPLE_ZONE, conntrack_zone]
+	CTA_TUPLE_ZONE	nlnetw[CTA_TUPLE_ZONE, conntrack_zone]
 ] [varlen]
 
 cta_ip_nla_policy [
@@ -85,13 +93,13 @@ nf_ct_tcp_flags {
 dccp_nla_policy [
 	CTA_PROTOINFO_DCCP_STATE		nlattr[CTA_PROTOINFO_DCCP_STATE, int8]
 	CTA_PROTOINFO_DCCP_ROLE			nlattr[CTA_PROTOINFO_DCCP_ROLE, int8]
-	CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ	nlattr[CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ, int64be]
+	CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ	nlnetw[CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ, int64be]
 ] [varlen]
 
 sctp_nla_policy [
 	CTA_PROTOINFO_SCTP_STATE		nlattr[CTA_PROTOINFO_SCTP_STATE, int8]
-	CTA_PROTOINFO_SCTP_VTAG_ORIGINAL	nlattr[CTA_PROTOINFO_SCTP_VTAG_ORIGINAL, int32be]
-	CTA_PROTOINFO_SCTP_VTAG_REPLY		nlattr[CTA_PROTOINFO_SCTP_VTAG_REPLY, int32be]
+	CTA_PROTOINFO_SCTP_VTAG_ORIGINAL	nlnetw[CTA_PROTOINFO_SCTP_VTAG_ORIGINAL, int32be]
+	CTA_PROTOINFO_SCTP_VTAG_REPLY		nlnetw[CTA_PROTOINFO_SCTP_VTAG_REPLY, int32be]
 ] [varlen]
 
 nat_nla_policy [

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_386.const b/sys/linux/socket_netlink_netfilter_conntrack_386.const
@@ -35,6 +35,11 @@ CTA_PROTOINFO_TCP_WSCALE_REPLY = 3
 CTA_PROTONAT_PORT_MAX = 2
 CTA_PROTONAT_PORT_MIN = 1
 CTA_PROTO_NUM = 1
+CTA_SEQADJ_CORRECTION_POS = 1
+CTA_SEQADJ_OFFSET_AFTER = 3
+CTA_SEQADJ_OFFSET_BEFORE = 2
+CTA_SEQ_ADJ_ORIG = 15
+CTA_SEQ_ADJ_REPLY = 16
 CTA_STATUS = 3
 CTA_TIMEOUT = 7
 CTA_TUPLE_IP = 1

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_amd64.const b/sys/linux/socket_netlink_netfilter_conntrack_amd64.const
@@ -35,6 +35,11 @@ CTA_PROTOINFO_TCP_WSCALE_REPLY = 3
 CTA_PROTONAT_PORT_MAX = 2
 CTA_PROTONAT_PORT_MIN = 1
 CTA_PROTO_NUM = 1
+CTA_SEQADJ_CORRECTION_POS = 1
+CTA_SEQADJ_OFFSET_AFTER = 3
+CTA_SEQADJ_OFFSET_BEFORE = 2
+CTA_SEQ_ADJ_ORIG = 15
+CTA_SEQ_ADJ_REPLY = 16
 CTA_STATUS = 3
 CTA_TIMEOUT = 7
 CTA_TUPLE_IP = 1

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_arm.const b/sys/linux/socket_netlink_netfilter_conntrack_arm.const
@@ -35,6 +35,11 @@ CTA_PROTOINFO_TCP_WSCALE_REPLY = 3
 CTA_PROTONAT_PORT_MAX = 2
 CTA_PROTONAT_PORT_MIN = 1
 CTA_PROTO_NUM = 1
+CTA_SEQADJ_CORRECTION_POS = 1
+CTA_SEQADJ_OFFSET_AFTER = 3
+CTA_SEQADJ_OFFSET_BEFORE = 2
+CTA_SEQ_ADJ_ORIG = 15
+CTA_SEQ_ADJ_REPLY = 16
 CTA_STATUS = 3
 CTA_TIMEOUT = 7
 CTA_TUPLE_IP = 1

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_arm64.const b/sys/linux/socket_netlink_netfilter_conntrack_arm64.const
@@ -35,6 +35,11 @@ CTA_PROTOINFO_TCP_WSCALE_REPLY = 3
 CTA_PROTONAT_PORT_MAX = 2
 CTA_PROTONAT_PORT_MIN = 1
 CTA_PROTO_NUM = 1
+CTA_SEQADJ_CORRECTION_POS = 1
+CTA_SEQADJ_OFFSET_AFTER = 3
+CTA_SEQADJ_OFFSET_BEFORE = 2
+CTA_SEQ_ADJ_ORIG = 15
+CTA_SEQ_ADJ_REPLY = 16
 CTA_STATUS = 3
 CTA_TIMEOUT = 7
 CTA_TUPLE_IP = 1

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_exp.txt b/sys/linux/socket_netlink_netfilter_conntrack_exp.txt
@@ -18,18 +18,18 @@ exp_nla_policy [
 	CTA_EXPECT_MASTER	nlnest[CTA_EXPECT_MASTER, array[tuple_nla_policy]]
 	CTA_EXPECT_TUPLE	nlnest[CTA_EXPECT_TUPLE, array[tuple_nla_policy]]
 	CTA_EXPECT_MASK		nlnest[CTA_EXPECT_MASK, array[tuple_nla_policy]]
-	CTA_EXPECT_TIMEOUT	nlattr[CTA_EXPECT_TIMEOUT, int32be]
-	CTA_EXPECT_ID		nlattr[CTA_EXPECT_ID, int32be]
+	CTA_EXPECT_TIMEOUT	nlnetw[CTA_EXPECT_TIMEOUT, int32be]
+	CTA_EXPECT_ID		nlnetw[CTA_EXPECT_ID, int32be]
 	CTA_EXPECT_HELP_NAME	nlattr[CTA_EXPECT_HELP_NAME, string[xt_helper_names]]
-	CTA_EXPECT_ZONE		nlattr[CTA_EXPECT_ZONE, conntrack_zone]
-	CTA_EXPECT_FLAGS	nlattr[CTA_EXPECT_FLAGS, flags[conntrack_exp_flags, int32be]]
-	CTA_EXPECT_CLASS	nlattr[CTA_EXPECT_CLASS, int32be]
+	CTA_EXPECT_ZONE		nlnetw[CTA_EXPECT_ZONE, conntrack_zone]
+	CTA_EXPECT_FLAGS	nlnetw[CTA_EXPECT_FLAGS, flags[conntrack_exp_flags, int32be]]
+	CTA_EXPECT_CLASS	nlnetw[CTA_EXPECT_CLASS, int32be]
 	CTA_EXPECT_NAT		nlnest[CTA_EXPECT_NAT, array[exp_nat_nla_policy]]
 	CTA_EXPECT_FN		nlattr[CTA_EXPECT_FN, string[conntrack_exp_func]]
 ] [varlen]
 
 exp_nat_nla_policy [
-	CTA_EXPECT_NAT_DIR	nlattr[CTA_EXPECT_NAT_DIR, int32be[0:1]]
+	CTA_EXPECT_NAT_DIR	nlnetw[CTA_EXPECT_NAT_DIR, int32be[0:1]]
 	CTA_EXPECT_NAT_TUPLE	nlnest[CTA_EXPECT_NAT_TUPLE, array[tuple_nla_policy]]
 ] [varlen]
 

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_helper.txt b/sys/linux/socket_netlink_netfilter_conntrack_helper.txt
@@ -16,10 +16,10 @@ sendmsg$NFNL_MSG_CTHELPER_DEL(fd sock_nl_netfilter, msg ptr[in, msghdr_cthelper[
 nfnl_cthelper_policy [
 	NFCTH_NAME		nlattr[NFCTH_NAME, string[cthelper_name]]
 	NFCTH_TUPLE		nlattr[NFCTH_TUPLE, array[tuple_nla_policy]]
-	NFCTH_QUEUE_NUM		nlattr[NFCTH_QUEUE_NUM, int32be]
-	NFCTH_POLICY		nlattr[NFCTH_POLICY, nlattr[NFCTH_POLICY_SET_MAX, int32be]]
-	NFCTH_PRIV_DATA_LEN	nlattr[NFCTH_PRIV_DATA_LEN, int32be[0:32]]
-	NFCTH_STATUS		nlattr[NFCTH_STATUS, int32be[0:1]]
+	NFCTH_QUEUE_NUM		nlnetw[NFCTH_QUEUE_NUM, int32be]
+	NFCTH_POLICY		nlnest[NFCTH_POLICY, nlnetw[NFCTH_POLICY_SET_NUM, int32be]]
+	NFCTH_PRIV_DATA_LEN	nlnetw[NFCTH_PRIV_DATA_LEN, int32be[0:32]]
+	NFCTH_STATUS		nlnetw[NFCTH_STATUS, int32be[0:1]]
 ] [varlen]
 
 cthelper_name = "syz0", "syz1"
diff --git a/sys/linux/socket_netlink_netfilter_conntrack_helper_386.const b/sys/linux/socket_netlink_netfilter_conntrack_helper_386.const
@@ -1,7 +1,7 @@
 # AUTOGENERATED FILE
 NFCTH_NAME = 1
 NFCTH_POLICY = 4
-NFCTH_POLICY_SET_MAX = 5
+NFCTH_POLICY_SET_NUM = 1
 NFCTH_PRIV_DATA_LEN = 5
 NFCTH_QUEUE_NUM = 3
 NFCTH_STATUS = 6

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_helper_amd64.const b/sys/linux/socket_netlink_netfilter_conntrack_helper_amd64.const
@@ -1,7 +1,7 @@
 # AUTOGENERATED FILE
 NFCTH_NAME = 1
 NFCTH_POLICY = 4
-NFCTH_POLICY_SET_MAX = 5
+NFCTH_POLICY_SET_NUM = 1
 NFCTH_PRIV_DATA_LEN = 5
 NFCTH_QUEUE_NUM = 3
 NFCTH_STATUS = 6

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_helper_arm.const b/sys/linux/socket_netlink_netfilter_conntrack_helper_arm.const
@@ -1,7 +1,7 @@
 # AUTOGENERATED FILE
 NFCTH_NAME = 1
 NFCTH_POLICY = 4
-NFCTH_POLICY_SET_MAX = 5
+NFCTH_POLICY_SET_NUM = 1
 NFCTH_PRIV_DATA_LEN = 5
 NFCTH_QUEUE_NUM = 3
 NFCTH_STATUS = 6

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_helper_arm64.const b/sys/linux/socket_netlink_netfilter_conntrack_helper_arm64.const
@@ -1,7 +1,7 @@
 # AUTOGENERATED FILE
 NFCTH_NAME = 1
 NFCTH_POLICY = 4
-NFCTH_POLICY_SET_MAX = 5
+NFCTH_POLICY_SET_NUM = 1
 NFCTH_PRIV_DATA_LEN = 5
 NFCTH_QUEUE_NUM = 3
 NFCTH_STATUS = 6

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_helper_mips64le.const b/sys/linux/socket_netlink_netfilter_conntrack_helper_mips64le.const
@@ -1,7 +1,7 @@
 # AUTOGENERATED FILE
 NFCTH_NAME = 1
 NFCTH_POLICY = 4
-NFCTH_POLICY_SET_MAX = 5
+NFCTH_POLICY_SET_NUM = 1
 NFCTH_PRIV_DATA_LEN = 5
 NFCTH_QUEUE_NUM = 3
 NFCTH_STATUS = 6

diff --git a/sys/linux/socket_netlink_netfilter_conntrack_helper_ppc64le.const b/sys/linux/socket_netlink_netfilter_conntrack_helper_ppc64le.const
@@ -1,7 +1,7 @@
 # AUTOGENERATED FILE
 NFCTH_NAME = 1
 NFCTH_POLICY = 4
-NFCTH_POLICY_SET_MAX = 5
+NFCTH_POLICY_SET_NUM = 1
 NFCTH_PRIV_DATA_LEN = 5
 NFCTH_QUEUE_NUM = 3
 NFCTH_STATUS = 6