netfilter: nftables_offload: set address type in control dissector
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/2 netfilter: nftables_offload: set address type in control dissector
If the address type is missing through the control dissector, then matching on IPv4 and IPv6 addresses does not work. Set it accordingly so rules that specify an IP address succesfully match on packets.
Fixes c9626a2cbdb2 ("netfilter: nf_tables: add hardware offload support")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: no changes.
include/net/netfilter/nf_tables_offload.h | 4 ++++ net/netfilter/nf_tables_offload.c | 18 ++++++++++++++++++ net/netfilter/nft_payload.c | 4 ++++ 3 files changed, 26 insertions(+)
include/net/netfilter/nf_tables_offload.h +4 -0
@@ -37,6 +37,7 @@ void nft_offload_update_dependency(struct nft_offload_ctx *ctx,struct nft_flow_key {struct flow_dissector_key_basic basic; +struct flow_dissector_key_control control;union {struct flow_dissector_key_ipv4_addrs ipv4;struct flow_dissector_key_ipv6_addrs ipv6;
@@ -62,6 +63,9 @@ struct nft_flow_rule {#define NFT_OFFLOAD_F_ACTION (1 << 0) +void nft_flow_rule_set_addr_type (struct nft_flow_rule *flow, +enum flow_dissector_key_id addr_type); +struct nft_rule ;struct nft_flow_rule *nft_flow_rule_create (struct net *net,const struct nft_rule *rule);void nft_flow_rule_destroy (struct nft_flow_rule *flow);
net/netfilter/nf_tables_offload.c +18 -0
@@ -28,6 +28,24 @@ static struct nft_flow_rule *nft_flow_rule_alloc(int num_actions)return flow; } +void nft_flow_rule_set_addr_type (struct nft_flow_rule *flow, +enum flow_dissector_key_id addr_type) +{ +struct nft_flow_match *match = &flow->match; +struct nft_flow_key *mask = &match->mask; +struct nft_flow_key *key = &match->key; + +if (match->dissector.used_keys &BIT (FLOW_DISSECTOR_KEY_CONTROL )) +return ; + + key->control.addr_type = addr_type; + mask->control.addr_type =0xffff ; + match->dissector.used_keys |=BIT (FLOW_DISSECTOR_KEY_CONTROL ); + match->dissector.offset[FLOW_DISSECTOR_KEY_CONTROL ] = + offsetof(struct nft_flow_key , control); +} +EXPORT_SYMBOL_GPL (nft_flow_rule_set_addr_type); +struct nft_flow_rule *nft_flow_rule_create (struct net *net,const struct nft_rule *rule) {
net/netfilter/nft_payload.c +4 -0
@@ -244,6 +244,7 @@ static int nft_payload_offload_ip(struct nft_offload_ctx *ctx,NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_IPV4_ADDRS , ipv4, src,sizeof (struct in_addr ), reg); +nft_flow_rule_set_addr_type (flow,FLOW_DISSECTOR_KEY_IPV4_ADDRS );break ;case offsetof(struct iphdr , daddr):if (priv->len !=sizeof (struct in_addr ))
@@ -251,6 +252,7 @@ static int nft_payload_offload_ip(struct nft_offload_ctx *ctx,NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_IPV4_ADDRS , ipv4, dst,sizeof (struct in_addr ), reg); +nft_flow_rule_set_addr_type (flow,FLOW_DISSECTOR_KEY_IPV4_ADDRS );break ;case offsetof(struct iphdr , protocol):if (priv->len !=sizeof (__u8))
@@ -280,6 +282,7 @@ static int nft_payload_offload_ip6(struct nft_offload_ctx *ctx,NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_IPV6_ADDRS , ipv6, src,sizeof (struct in6_addr ), reg); +nft_flow_rule_set_addr_type (flow,FLOW_DISSECTOR_KEY_IPV6_ADDRS );break ;case offsetof(struct ipv6hdr , daddr):if (priv->len !=sizeof (struct in6_addr ))
@@ -287,6 +290,7 @@ static int nft_payload_offload_ip6(struct nft_offload_ctx *ctx,NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_IPV6_ADDRS , ipv6, dst,sizeof (struct in6_addr ), reg); +nft_flow_rule_set_addr_type (flow,FLOW_DISSECTOR_KEY_IPV6_ADDRS );break ;case offsetof(struct ipv6hdr , nexthdr):if (priv->len !=sizeof (__u8))
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v2 2/2 netfilter: nftables_offload: build mask based from the matching bytes
Userspace might match on prefix bytes of header fields if they are on the byte boundary, this requires that the mask is adjusted accordingly. Use NFT_OFFLOAD_MATCH_EXACT() for meta since prefix byte matching is not allowed for this type of selector.
Fixes c9626a2cbdb2 ("netfilter: nf_tables: add hardware offload support")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: fix sparse warning.
include/net/netfilter/nf_tables_offload.h | 3 ++ net/netfilter/nft_cmp.c | 8 +-- net/netfilter/nft_meta.c | 16 +++--- net/netfilter/nft_payload.c | 66 +++++++++++++++++------ 4 files changed, 64 insertions(+), 29 deletions(-)
include/net/netfilter/nf_tables_offload.h +3 -0
@@ -78,6 +78,9 @@ int nft_flow_rule_offload_commit(struct net *net); offsetof(struct nft_flow_key, __base.__field); \ (__reg)->len = __len; \ (__reg)->key = __key; \ + +#define NFT_OFFLOAD_MATCH_EXACT (__key, __base, __field, __len, __reg) \ + NFT_OFFLOAD_MATCH(__key, __base, __field, __len, __reg) \ memset(&(__reg)->mask, 0xff, (__reg)->len);int nft_chain_offload_priority (struct nft_base_chain *basechain);
net/netfilter/nft_cmp.c +4 -4
@@ -123,11 +123,11 @@ static int __nft_cmp_offload(struct nft_offload_ctx *ctx,u8 *mask = (u8 *)&flow->match.mask;u8 *key = (u8 *)&flow->match.key; -if (priv->op !=NFT_CMP_EQ || reg->len != priv->len) +if (priv->op !=NFT_CMP_EQ || priv->len > reg->len)return -EOPNOTSUPP ; -memcpy (key + reg->offset, &priv->data, priv->len); -memcpy (mask + reg->offset, ®->mask, priv->len); +memcpy (key + reg->offset, &priv->data, reg->len); +memcpy (mask + reg->offset, ®->mask, reg->len); flow->match.dissector.used_keys |=BIT (reg->key); flow->match.dissector.offset[reg->key] = reg->base_offset;
@@ -137,7 +137,7 @@ static int __nft_cmp_offload(struct nft_offload_ctx *ctx, nft_reg_load16(priv->data.data) != ARPHRD_ETHER) return -EOPNOTSUPP; -nft_offload_update_dependency (ctx, &priv->data, priv->len); +nft_offload_update_dependency (ctx, &priv->data, reg->len);return 0 ; }
net/netfilter/nft_meta.c +8 -8
@@ -724,22 +724,22 @@ static int nft_meta_get_offload(struct nft_offload_ctx *ctx,switch (priv->key) {case NFT_META_PROTOCOL : -NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_BASIC , basic, n_proto, -sizeof (__u16), reg); +NFT_OFFLOAD_MATCH_EXACT (FLOW_DISSECTOR_KEY_BASIC , basic, n_proto, +sizeof (__u16), reg);nft_offload_set_dependency (ctx,NFT_OFFLOAD_DEP_NETWORK );break ;case NFT_META_L4PROTO : -NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_BASIC , basic, ip_proto, -sizeof (__u8), reg); +NFT_OFFLOAD_MATCH_EXACT (FLOW_DISSECTOR_KEY_BASIC , basic, ip_proto, +sizeof (__u8), reg);nft_offload_set_dependency (ctx,NFT_OFFLOAD_DEP_TRANSPORT );break ;case NFT_META_IIF : -NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_META , meta, - ingress_ifindex,sizeof (__u32), reg); +NFT_OFFLOAD_MATCH_EXACT (FLOW_DISSECTOR_KEY_META , meta, + ingress_ifindex,sizeof (__u32), reg);break ;case NFT_META_IIFTYPE : -NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_META , meta, - ingress_iftype,sizeof (__u16), reg); +NFT_OFFLOAD_MATCH_EXACT (FLOW_DISSECTOR_KEY_META , meta, + ingress_iftype,sizeof (__u16), reg);break ;default :return -EOPNOTSUPP ;
net/netfilter/nft_payload.c +49 -17
174 lines not on this page · raw message
Signature · 1 line
2.20.1