tools/syz-check: improve matching netlink attributes

1. Match policies that has a _suffix in our descriptions (we frequently do this to improve precision or avoid dup names). 2. Rename policies in descriptions to match kernel names. 3. Match policy if there are several such names in kernel. 4. Recognize policies with helper sub-policies. Update #590
google · Jan 22, 2020 · e4c56f3 · e4c56f3
1 parent 010feb8
commit e4c56f3
Show file tree

Hide file tree

Showing 47 changed files with 11,552 additions and 11,037 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,2 +1,2 @@
-bad-netlink-attr: nbd_attr_policy.NBD_ATTR_SOCKETS: should be nlnest [amd64]
+bad-netlink-attr: nbd_attr_policy.NBD_ATTR_SOCKETS: should be nlnest
 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.warn b/sys/linux/ipvs.txt.warn
@@ -1,5 +1,5 @@
-bad-netlink-attr: ip_vs_cmd_policy.IPVS_CMD_ATTR_SERVICE: should be nlnest [amd64]
-bad-netlink-attr: ip_vs_cmd_policy.IPVS_CMD_ATTR_DEST: should be nlnest [amd64]
-bad-netlink-attr: ip_vs_cmd_policy.IPVS_CMD_ATTR_DAEMON: should be nlnest [amd64]
-bad-netlink-attr: ip_vs_dest_policy.IPVS_DEST_ATTR_FWD_METHOD: bad size 2, expect 4 [amd64]
+bad-netlink-attr: ip_vs_cmd_policy.IPVS_CMD_ATTR_SERVICE: should be nlnest
+bad-netlink-attr: ip_vs_cmd_policy.IPVS_CMD_ATTR_DEST: should be nlnest
+bad-netlink-attr: ip_vs_cmd_policy.IPVS_CMD_ATTR_DAEMON: should be nlnest
+bad-netlink-attr: ip_vs_dest_policy.IPVS_DEST_ATTR_FWD_METHOD: bad size 2, expect 4
 no-such-struct: ip_vs_svcdest_user
diff --git a/sys/linux/socket_netlink_generic_80211.txt b/sys/linux/socket_netlink_generic_80211.txt
diff --git a/sys/linux/socket_netlink_generic_80211.txt.warn b/sys/linux/socket_netlink_generic_80211.txt.warn
@@ -1,27 +1,45 @@
 no-such-struct: nl80211_wdev
-no-such-netlink-policy: nl80211_dev_policy [amd64]
-no-such-netlink-policy: nl80211_wiphy_policy [amd64]
-no-such-netlink-policy: nl80211_setns_policy [amd64]
-no-such-netlink-policy: nl80211_interface_policy [amd64]
-no-such-netlink-policy: nl80211_cmd_key_policy [amd64]
-bad-netlink-attr: nl80211_key_policy.NL80211_KEY_DEFAULT_TYPES: should be nlnest [amd64]
-no-such-netlink-policy: nl80211_beacon_policy [amd64]
-no-such-netlink-policy: nl80211_tx_rates_policy [amd64]
-no-such-netlink-policy: nl80211_station_policy [amd64]
-no-such-netlink-policy: nl80211_mpath_policy [amd64]
-no-such-netlink-policy: nl80211_bss_policy [amd64]
-no-such-netlink-policy: nl80211_reg_policy [amd64]
-no-such-netlink-policy: nl80211_mesh_policy [amd64]
-no-such-netlink-policy: nl80211_join_mesh_policy [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_TTL: bad min value 0, expect 1 [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_ELEMENT_TTL: bad min value 0, expect 1 [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: bad min value 0, expect 1 [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: bad min value 0, expect 1 [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: bad min value 0, expect 1 [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: bad min value 0, expect 1 [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_RANN_INTERVAL: bad min value 0, expect 1 [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_ROOT_INTERVAL: bad min value 0, expect 1 [amd64]
-bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL: bad min value 0, expect 1 [amd64]
-no-such-netlink-policy: nl80211_scan_policy [amd64]
-no-such-netlink-policy: nl80211_rates_policy [amd64]
-bad-netlink-attr: nl80211_match_policy.NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI: should be nlnest [amd64]
+bad-netlink-attr: nl80211_policy_wiphy.NL80211_ATTR_WIPHY_TXQ_PARAMS: should be nlnest
+bad-netlink-attr: nl80211_policy_wiphy.NL80211_ATTR_WIPHY_RETRY_SHORT: bad min value 0, expect 1
+bad-netlink-attr: nl80211_policy_wiphy.NL80211_ATTR_WIPHY_RETRY_LONG: bad min value 0, expect 1
+bad-netlink-attr: nl80211_policy_cmd_key.NL80211_ATTR_KEY_DEFAULT_TYPES: should be nlnest
+bad-netlink-attr: nl80211_policy_cmd_key.NL80211_ATTR_KEY: should be nlnest
+bad-netlink-attr: nl80211_policy_key.NL80211_KEY_DATA_WEP40: bad size 5, expect 4
+bad-netlink-attr: nl80211_policy_key.NL80211_KEY_DATA_WEP104: bad size 13, expect 4
+bad-netlink-attr: nl80211_policy_key.NL80211_KEY_IDX: expect string
+bad-netlink-attr: nl80211_policy_key.NL80211_KEY_SEQ: expect string
+bad-netlink-attr: nl80211_policy_key.NL80211_KEY_DEFAULT: bad size 0, expect 4
+bad-netlink-attr: nl80211_policy_key.NL80211_KEY_DEFAULT_MGMT: bad size 0, expect 6
+bad-netlink-attr: nl80211_policy_key.NL80211_KEY_DEFAULT_TYPES: bad size -1, expect 1
+bad-netlink-attr: nl80211_policy_key.NL80211_KEY_MODE: bad size 1, expect 4
+bad-netlink-attr: nl80211_policy_beacon.NL80211_ATTR_FTM_RESPONDER: should be nlnest
+bad-netlink-attr: nl80211_policy_beacon.NL80211_ATTR_TX_RATES: should be nlnest
+bad-netlink-attr: nl80211_policy_beacon.NL80211_ATTR_MAC_ADDRS: should be nlnest
+no-such-netlink-policy: nl80211_tx_rates_policy
+bad-netlink-attr: nl80211_policy_station.NL80211_ATTR_VLAN_ID: bad min value 0, expect 1
+bad-netlink-attr: nl80211_policy_station.NL80211_ATTR_STA_SUPPORT_P2P_PS: bad max value 2, expect 1
+bad-netlink-attr: nl80211_policy_station.NL80211_ATTR_STA_FLAGS: should be nlnest
+bad-netlink-attr: nl80211_policy_station.NL80211_ATTR_STA_PLINK_ACTION: bad max value 3, expect 2
+bad-netlink-attr: nl80211_policy_station.NL80211_ATTR_STA_PLINK_STATE: bad max value 7, expect 6
+bad-netlink-attr: nl80211_policy_station.NL80211_ATTR_LOCAL_MESH_POWER_MODE: bad min value 0, expect 1
+bad-netlink-attr: nl80211_policy_station.NL80211_ATTR_AIRTIME_WEIGHT: bad min value 0, expect 1
+bad-netlink-attr: nl80211_policy_bss.NL80211_STA_WME_MAX_SP: expect string
+bad-netlink-attr: nl80211_policy_reg.NL80211_ATTR_REG_RULES: should be nlnest
+bad-netlink-attr: nl80211_policy_mesh.NL80211_ATTR_MESH_CONFIG: should be nlnest
+bad-netlink-attr: nl80211_policy_join_mesh.NL80211_ATTR_MESH_CONFIG: should be nlnest
+bad-netlink-attr: nl80211_policy_join_mesh.NL80211_ATTR_TX_RATES: should be nlnest
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_TTL: bad min value 0, expect 1
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_ELEMENT_TTL: bad min value 0, expect 1
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: bad min value 0, expect 1
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: bad min value 0, expect 1
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: bad min value 0, expect 1
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: bad min value 0, expect 1
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_RANN_INTERVAL: bad min value 0, expect 1
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_ROOT_INTERVAL: bad min value 0, expect 1
+bad-netlink-attr: nl80211_meshconf_params_policy.NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL: bad min value 0, expect 1
+bad-netlink-attr: nl80211_policy_scan.NL80211_ATTR_SCAN_FREQUENCIES: should be nlnest
+bad-netlink-attr: nl80211_policy_scan.NL80211_ATTR_SCAN_SSIDS: should be nlnest
+bad-netlink-attr: nl80211_policy_scan.NL80211_ATTR_SCAN_SUPP_RATES: should be nlnest
+bad-netlink-attr: nl80211_policy_scan.NL80211_ATTR_SCHED_SCAN_MATCH: should be nlnest
+no-such-netlink-policy: nl80211_rates_policy
+bad-netlink-attr: nl80211_match_policy.NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI: should be nlnest
diff --git a/sys/linux/socket_netlink_generic_devlink.txt b/sys/linux/socket_netlink_generic_devlink.txt
@@ -18,22 +18,20 @@ devlink_devname {
 	z	const[0, int8]
 } [packed]
 
-# devlink_nl_policy in kernel
-devlink_handle_nsim {
+devlink_nl_policy_nsim {
 	DEVLINK_ATTR_BUS_NAME	nlattr[DEVLINK_ATTR_BUS_NAME, string["netdevsim"]]
 	DEVLINK_ATTR_DEV_NAME	nlattr[DEVLINK_ATTR_DEV_NAME, devlink_devname]
 } [packed, align_4]
 
-# devlink_nl_policy in kernel
-devlink_handle_pci {
+devlink_nl_policy_pci {
 	DEVLINK_ATTR_BUS_NAME	nlattr[DEVLINK_ATTR_BUS_NAME, string["pci"]]
 # 0000:00:10.0 is a fixed pci address what is moved from initial network namespace by initialize_devlink()
 	DEVLINK_ATTR_DEV_NAME	nlattr[DEVLINK_ATTR_DEV_NAME, string["0000:00:10.0"]]
 } [packed, align_4]
 
 devlink_handle [
-	nsim	devlink_handle_nsim
-	pci	devlink_handle_pci
+	nsim	devlink_nl_policy_nsim
+	pci	devlink_nl_policy_pci
 ] [varlen]
 
 devlink_port_handle {
@@ -48,15 +46,15 @@ sendmsg$DEVLINK_CMD_GET(fd sock_nl_generic, msg ptr[in, msghdr_nl_devlink[DEVLIN
 type msghdr_nl_devlink_reload msghdr_netlink[netlink_msg_t[genl_devlink_family_id, genlmsghdr_t[DEVLINK_CMD_RELOAD], devlink_reload]]
 sendmsg$DEVLINK_CMD_RELOAD(fd sock_nl_generic, msg ptr[in, msghdr_nl_devlink_reload], f flags[send_flags])
 
-devlink_reload_arg [
+devlink_nl_policy_reload [
 	DEVLINK_ATTR_NETNS_PID	nlattr[DEVLINK_ATTR_NETNS_PID, pid]
 	DEVLINK_ATTR_NETNS_FD	nlattr[DEVLINK_ATTR_NETNS_FD, fd_namespace]
 	DEVLINK_ATTR_NETNS_ID	nlattr[DEVLINK_ATTR_NETNS_ID, netns_id]
 ] [varlen]
 
 devlink_reload {
 	handle	devlink_handle
-	arg	devlink_reload_arg
+	arg	devlink_nl_policy_reload
 } [packed, align_4]
 
 type msghdr_nl_devlink_port_get msghdr_netlink[netlink_msg_t[genl_devlink_family_id, genlmsghdr_t[DEVLINK_CMD_PORT_GET], devlink_port_get]]

diff --git a/sys/linux/socket_netlink_generic_devlink.txt.warn b/sys/linux/socket_netlink_generic_devlink.txt.warn
@@ -1,4 +1,4 @@
 no-such-struct: devlink_devname
-no-such-netlink-policy: devlink_handle_nsim
-no-such-netlink-policy: devlink_handle_pci
-no-such-netlink-policy: devlink_reload_arg [amd64]
+no-such-struct: devlink_nl_policy_nsim
+bad-netlink-attr: devlink_nl_policy_nsim.DEVLINK_ATTR_DEV_NAME: expect string
+no-such-struct: devlink_nl_policy_pci
diff --git a/sys/linux/socket_netlink_generic_fou.txt.warn b/sys/linux/socket_netlink_generic_fou.txt.warn
@@ -1,2 +1,2 @@
-bad-netlink-attr: fou_nl_policy.FOU_ATTR_LOCAL_V6: unhandled type 16 [amd64]
-bad-netlink-attr: fou_nl_policy.FOU_ATTR_PEER_V6: unhandled type 16 [amd64]
+bad-netlink-attr: fou_nl_policy.FOU_ATTR_LOCAL_V6: unhandled type 16
+bad-netlink-attr: fou_nl_policy.FOU_ATTR_PEER_V6: unhandled type 16
diff --git a/sys/linux/socket_netlink_generic_gtp.txt.warn b/sys/linux/socket_netlink_generic_gtp.txt.warn
diff --git a/sys/linux/socket_netlink_generic_netlabel.txt b/sys/linux/socket_netlink_generic_netlabel.txt
@@ -85,16 +85,16 @@ netlbl_cipsov4_genl_policy [
 	NLBL_CIPSOV4_A_DOI		nlattr[NLBL_CIPSOV4_A_DOI, flags[cipso_doi, int32]]
 	NLBL_CIPSOV4_A_MTYPE		nlattr[NLBL_CIPSOV4_A_MTYPE, flags[cipsov4_type, int32]]
 	NLBL_CIPSOV4_A_TAGLST		nlattr[NLBL_CIPSOV4_A_TAGLST, array[nlattr[NLBL_CIPSOV4_A_TAG, flags[cipsov4_tags, int8]]]]
-	NLBL_CIPSOV4_A_MLSLVLLST	nlattr[NLBL_CIPSOV4_A_MLSLVLLST, array[nlattr[NLBL_CIPSOV4_A_MLSLVL, array[netlbl_cipsov4_mlslvl_policy]]]]
-	NLBL_CIPSOV4_A_MLSCATLST	nlattr[NLBL_CIPSOV4_A_MLSCATLST, array[nlattr[NLBL_CIPSOV4_A_MLSCAT, array[netlbl_cipsov4_mlscat_policy]]]]
+	NLBL_CIPSOV4_A_MLSLVLLST	nlattr[NLBL_CIPSOV4_A_MLSLVLLST, array[nlattr[NLBL_CIPSOV4_A_MLSLVL, array[netlbl_cipsov4_genl_policy_mlslvl]]]]
+	NLBL_CIPSOV4_A_MLSCATLST	nlattr[NLBL_CIPSOV4_A_MLSCATLST, array[nlattr[NLBL_CIPSOV4_A_MLSCAT, array[netlbl_cipsov4_genl_policy_mlscat]]]]
 ] [varlen]
 
-netlbl_cipsov4_mlslvl_policy [
+netlbl_cipsov4_genl_policy_mlslvl [
 	NLBL_CIPSOV4_A_MLSLVLLOC	nlattr[NLBL_CIPSOV4_A_MLSLVLLOC, int32[0:CIPSO_V4_MAX_LOC_LVLS]]
 	NLBL_CIPSOV4_A_MLSLVLREM	nlattr[NLBL_CIPSOV4_A_MLSLVLREM, int32[0:CIPSO_V4_MAX_REM_LVLS]]
 ] [varlen]
 
-netlbl_cipsov4_mlscat_policy [
+netlbl_cipsov4_genl_policy_mlscat [
 	NLBL_CIPSOV4_A_MLSCATLOC	nlattr[NLBL_CIPSOV4_A_MLSCATLOC, int32[0:CIPSO_V4_MAX_LOC_CATS]]
 	NLBL_CIPSOV4_A_MLSCATREM	nlattr[NLBL_CIPSOV4_A_MLSCATREM, int32[0:CIPSO_V4_MAX_REM_CATS]]
 ] [varlen]

diff --git a/sys/linux/socket_netlink_generic_netlabel.txt.warn b/sys/linux/socket_netlink_generic_netlabel.txt.warn
@@ -1,5 +1,3 @@
-bad-netlink-attr: netlbl_cipsov4_genl_policy.NLBL_CIPSOV4_A_TAGLST: should be nlnest [amd64]
-bad-netlink-attr: netlbl_cipsov4_genl_policy.NLBL_CIPSOV4_A_MLSLVLLST: should be nlnest [amd64]
-bad-netlink-attr: netlbl_cipsov4_genl_policy.NLBL_CIPSOV4_A_MLSCATLST: should be nlnest [amd64]
-no-such-netlink-policy: netlbl_cipsov4_mlslvl_policy [amd64]
-no-such-netlink-policy: netlbl_cipsov4_mlscat_policy [amd64]
+bad-netlink-attr: netlbl_cipsov4_genl_policy.NLBL_CIPSOV4_A_TAGLST: should be nlnest
+bad-netlink-attr: netlbl_cipsov4_genl_policy.NLBL_CIPSOV4_A_MLSLVLLST: should be nlnest
+bad-netlink-attr: netlbl_cipsov4_genl_policy.NLBL_CIPSOV4_A_MLSCATLST: should be nlnest
diff --git a/sys/linux/socket_netlink_generic_team.txt.warn b/sys/linux/socket_netlink_generic_team.txt.warn
@@ -1,4 +1,4 @@
-bad-netlink-attr: team_nl_policy.TEAM_ATTR_LIST_OPTION: should be nlnest [amd64]
+bad-netlink-attr: team_nl_policy.TEAM_ATTR_LIST_OPTION: should be nlnest
 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_acct.txt b/sys/linux/socket_netlink_netfilter_acct.txt
@@ -21,10 +21,10 @@ nfnl_acct_policy [
 	NFACCT_PKTS	nlnetw[NFACCT_PKTS, int64be]
 	NFACCT_FLAGS	nlnetw[NFACCT_FLAGS, flags[nfnl_acct_flags, int32be]]
 	NFACCT_QUOTA	nlnetw[NFACCT_QUOTA, int64be]
-	NFACCT_FILTER	nlnest[NFACCT_FILTER, array[nfnl_acct_filter_policy]]
+	NFACCT_FILTER	nlnest[NFACCT_FILTER, array[filter_policy_acct]]
 ] [varlen]
 
-nfnl_acct_filter_policy [
+filter_policy_acct [
 	NFACCT_FILTER_MASK	nlnetw[NFACCT_FILTER_MASK, int32be]
 	NFACCT_FILTER_VALUE	nlnetw[NFACCT_FILTER_VALUE, int32be]
 ] [varlen]

diff --git a/sys/linux/socket_netlink_netfilter_acct.txt.warn b/sys/linux/socket_netlink_netfilter_acct.txt.warn
diff --git a/sys/linux/socket_netlink_netfilter_conntrack.txt b/sys/linux/socket_netlink_netfilter_conntrack.txt
@@ -49,16 +49,16 @@ tuple_nla_policy [
 ] [varlen]
 
 cta_ip_nla_policy [
-	ipv4	cta_ip_nla_policy4
-	ipv6	cta_ip_nla_policy6
+	ipv4	cta_ip_nla_policy_ipv4
+	ipv6	cta_ip_nla_policy_ipv6
 ] [varlen]
 
-cta_ip_nla_policy4 {
+cta_ip_nla_policy_ipv4 {
 	CTA_IP_V4_SRC	nlattr[CTA_IP_V4_SRC, ipv4_addr]
 	CTA_IP_V4_DST	nlattr[CTA_IP_V4_DST, ipv4_addr]
 }
 
-cta_ip_nla_policy6 {
+cta_ip_nla_policy_ipv6 {
 	CTA_IP_V6_SRC	nlattr[CTA_IP_V6_SRC, ipv6_addr]
 	CTA_IP_V6_DST	nlattr[CTA_IP_V6_DST, ipv6_addr]
 }

diff --git a/sys/linux/socket_netlink_netfilter_conntrack.txt.warn b/sys/linux/socket_netlink_netfilter_conntrack.txt.warn
@@ -1,15 +1,15 @@
-bad-netlink-attr: ct_nla_policy.CTA_TUPLE_ORIG: should be nlnest [amd64]
-bad-netlink-attr: ct_nla_policy.CTA_TUPLE_REPLY: should be nlnest [amd64]
-bad-netlink-attr: ct_nla_policy.CTA_PROTOINFO: should be nlnest [amd64]
-bad-netlink-attr: ct_nla_policy.CTA_HELP: should be nlnest [amd64]
-bad-netlink-attr: ct_nla_policy.CTA_NAT_SRC: should be nlnest [amd64]
-bad-netlink-attr: ct_nla_policy.CTA_NAT_DST: should be nlnest [amd64]
-bad-netlink-attr: ct_nla_policy.CTA_TUPLE_MASTER: should be nlnest [amd64]
-bad-netlink-attr: tuple_nla_policy.CTA_TUPLE_IP: should be nlnest [amd64]
-bad-netlink-attr: tuple_nla_policy.CTA_TUPLE_PROTO: should be nlnest [amd64]
-no-such-netlink-policy: cta_ip_nla_policy4
-no-such-netlink-policy: cta_ip_nla_policy6
-bad-netlink-attr: protoinfo_policy.CTA_PROTOINFO_TCP: should be nlnest [amd64]
-bad-netlink-attr: protoinfo_policy.CTA_PROTOINFO_DCCP: should be nlnest [amd64]
-bad-netlink-attr: protoinfo_policy.CTA_PROTOINFO_SCTP: should be nlnest [amd64]
-bad-netlink-attr: nat_nla_policy.CTA_NAT_PROTO: should be nlnest [amd64]
+bad-netlink-attr: ct_nla_policy.CTA_TUPLE_ORIG: should be nlnest
+bad-netlink-attr: ct_nla_policy.CTA_TUPLE_REPLY: should be nlnest
+bad-netlink-attr: ct_nla_policy.CTA_PROTOINFO: should be nlnest
+bad-netlink-attr: ct_nla_policy.CTA_HELP: should be nlnest
+bad-netlink-attr: ct_nla_policy.CTA_NAT_SRC: should be nlnest
+bad-netlink-attr: ct_nla_policy.CTA_NAT_DST: should be nlnest
+bad-netlink-attr: ct_nla_policy.CTA_TUPLE_MASTER: should be nlnest
+bad-netlink-attr: tuple_nla_policy.CTA_TUPLE_IP: should be nlnest
+bad-netlink-attr: tuple_nla_policy.CTA_TUPLE_PROTO: should be nlnest
+no-such-struct: cta_ip_nla_policy_ipv4
+no-such-struct: cta_ip_nla_policy_ipv6
+bad-netlink-attr: protoinfo_policy.CTA_PROTOINFO_TCP: should be nlnest
+bad-netlink-attr: protoinfo_policy.CTA_PROTOINFO_DCCP: should be nlnest
+bad-netlink-attr: protoinfo_policy.CTA_PROTOINFO_SCTP: should be nlnest
+bad-netlink-attr: nat_nla_policy.CTA_NAT_PROTO: should be nlnest
diff --git a/sys/linux/socket_netlink_netfilter_conntrack_exp.txt.warn b/sys/linux/socket_netlink_netfilter_conntrack_exp.txt.warn
@@ -1,5 +1,5 @@
-bad-netlink-attr: exp_nla_policy.CTA_EXPECT_MASTER: should be nlnest [amd64]
-bad-netlink-attr: exp_nla_policy.CTA_EXPECT_TUPLE: should be nlnest [amd64]
-bad-netlink-attr: exp_nla_policy.CTA_EXPECT_MASK: should be nlnest [amd64]
-bad-netlink-attr: exp_nla_policy.CTA_EXPECT_NAT: should be nlnest [amd64]
-bad-netlink-attr: exp_nat_nla_policy.CTA_EXPECT_NAT_TUPLE: should be nlnest [amd64]
+bad-netlink-attr: exp_nla_policy.CTA_EXPECT_MASTER: should be nlnest
+bad-netlink-attr: exp_nla_policy.CTA_EXPECT_TUPLE: should be nlnest
+bad-netlink-attr: exp_nla_policy.CTA_EXPECT_MASK: should be nlnest
+bad-netlink-attr: exp_nla_policy.CTA_EXPECT_NAT: should be nlnest
+bad-netlink-attr: exp_nat_nla_policy.CTA_EXPECT_NAT_TUPLE: should be nlnest
diff --git a/sys/linux/socket_netlink_netfilter_ipset.txt.warn b/sys/linux/socket_netlink_netfilter_ipset.txt.warn
@@ -1,4 +1,4 @@
 no-such-struct: ip_set_req_get_set_byname
 no-such-struct: ip_set_req_get_set_byindex
-no-such-netlink-policy: ip_set_type_create_policy [amd64]
-no-such-netlink-policy: ip_set_type_adt_policy [amd64]
+no-such-netlink-policy: ip_set_type_create_policy
+no-such-netlink-policy: ip_set_type_adt_policy