Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following batch contains netfilter updates for net-next. Basically,
enhancements for xt_recent, skip zeroing of timer in conntrack, fix
linking problem with recent redirect support for nf_tables, ipset
updates and a couple of cleanups. More specifically, they are:

1) Rise maximum number per IP address to be remembered in xt_recent
   while retaining backward compatibility, from Florian Westphal.

2) Skip zeroing timer area in nf_conn objects, also from Florian.

3) Inspect IPv4 and IPv6 traffic from the bridge to allow filtering using
   using meta l4proto and transport layer header, from Alvaro Neira.

4) Fix linking problems in the new redirect support when CONFIG_IPV6=n
   and IP6_NF_IPTABLES=n.

And ipset updates from Jozsef Kadlecsik:

5) Support updating element extensions when the set is full (fixes
   netfilter bugzilla id 880).

6) Fix set match with 32-bits userspace / 64-bits kernel.

7) Indicate explicitly when /0 networks are supported in ipset.

8) Simplify cidr handling for hash:*net* types.

9) Allocate the proper size of memory when /0 networks are supported.

10) Explicitly add padding elements to hash:net,net and hash:net,port,
    because the elements must be u32 sized for the used hash function.

Jozsef is also cooking ipset RCU conversion which should land soon if
they reach the merge window in time.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 92 insertions, 48 deletions

diff --git a/net/bridge/netfilter/nf_tables_bridge.c b/net/bridge/netfilter/nf_tables_bridge.c
index 074c557ab505..19473a9371b8 100644
--- a/net/bridge/netfilter/nf_tables_bridge.c
+++ b/net/bridge/netfilter/nf_tables_bridge.c
@@ -13,6 +13,82 @@
 #include <linux/module.h>
 #include <linux/netfilter_bridge.h>
 #include <net/netfilter/nf_tables.h>
+#include <net/netfilter/nf_tables_bridge.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <net/netfilter/nf_tables_ipv4.h>
+#include <net/netfilter/nf_tables_ipv6.h>
+
+int nft_bridge_iphdr_validate(struct sk_buff *skb)
+{
+        struct iphdr *iph;
+        u32 len;
+
+        if (!pskb_may_pull(skb, sizeof(struct iphdr)))
+                return 0;
+
+        iph = ip_hdr(skb);
+        if (iph->ihl < 5 || iph->version != 4)
+                return 0;
+
+        len = ntohs(iph->tot_len);
+        if (skb->len < len)
+                return 0;
+        else if (len < (iph->ihl*4))
+                return 0;
+
+        if (!pskb_may_pull(skb, iph->ihl*4))
+                return 0;
+
+        return 1;
+}
+EXPORT_SYMBOL_GPL(nft_bridge_iphdr_validate);
+
+int nft_bridge_ip6hdr_validate(struct sk_buff *skb)
+{
+        struct ipv6hdr *hdr;
+        u32 pkt_len;
+
+        if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
+                return 0;
+
+        hdr = ipv6_hdr(skb);
+        if (hdr->version != 6)
+                return 0;
+
+        pkt_len = ntohs(hdr->payload_len);
+        if (pkt_len + sizeof(struct ipv6hdr) > skb->len)
+                return 0;
+
+        return 1;
+}
+EXPORT_SYMBOL_GPL(nft_bridge_ip6hdr_validate);
+
+static inline void nft_bridge_set_pktinfo_ipv4(struct nft_pktinfo *pkt,
+                                               const struct nf_hook_ops *ops,
+                                               struct sk_buff *skb,
+                                               const struct net_device *in,
+                                               const struct net_device *out)
+{
+        if (nft_bridge_iphdr_validate(skb))
+                nft_set_pktinfo_ipv4(pkt, ops, skb, in, out);
+        else
+                nft_set_pktinfo(pkt, ops, skb, in, out);
+}
+
+static inline void nft_bridge_set_pktinfo_ipv6(struct nft_pktinfo *pkt,
+                                              const struct nf_hook_ops *ops,
+                                              struct sk_buff *skb,
+                                              const struct net_device *in,
+                                              const struct net_device *out)
+{
+#if IS_ENABLED(CONFIG_IPV6)
+        if (nft_bridge_ip6hdr_validate(skb) &&
+            nft_set_pktinfo_ipv6(pkt, ops, skb, in, out) == 0)
+                return;
+#endif
+        nft_set_pktinfo(pkt, ops, skb, in, out);
+}
 
 static unsigned int
 nft_do_chain_bridge(const struct nf_hook_ops *ops,
@@ -23,7 +99,17 @@ nft_do_chain_bridge(const struct nf_hook_ops *ops,
 {
         struct nft_pktinfo pkt;
 
-        nft_set_pktinfo(&pkt, ops, skb, in, out);
+        switch (eth_hdr(skb)->h_proto) {
+        case htons(ETH_P_IP):
+                nft_bridge_set_pktinfo_ipv4(&pkt, ops, skb, in, out);
+                break;
+        case htons(ETH_P_IPV6):
+                nft_bridge_set_pktinfo_ipv6(&pkt, ops, skb, in, out);
+                break;
+        default:
+                nft_set_pktinfo(&pkt, ops, skb, in, out);
+                break;
+        }
 
         return nft_do_chain(&pkt, ops);
 }
diff --git a/net/bridge/netfilter/nft_reject_bridge.c b/net/bridge/netfilter/nft_reject_bridge.c
index 48da2c54a69e..b0330aecbf97 100644
--- a/net/bridge/netfilter/nft_reject_bridge.c
+++ b/net/bridge/netfilter/nft_reject_bridge.c
@@ -14,6 +14,7 @@
 #include <linux/netfilter/nf_tables.h>
 #include <net/netfilter/nf_tables.h>
 #include <net/netfilter/nft_reject.h>
+#include <net/netfilter/nf_tables_bridge.h>
 #include <net/netfilter/ipv4/nf_reject.h>
 #include <net/netfilter/ipv6/nf_reject.h>
 #include <linux/ip.h>
@@ -35,30 +36,6 @@ static void nft_reject_br_push_etherhdr(struct sk_buff *oldskb,
         skb_pull(nskb, ETH_HLEN);
 }
 
-static int nft_reject_iphdr_validate(struct sk_buff *oldskb)
-{
-        struct iphdr *iph;
-        u32 len;
-
-        if (!pskb_may_pull(oldskb, sizeof(struct iphdr)))
-                return 0;
-
-        iph = ip_hdr(oldskb);
-        if (iph->ihl < 5 || iph->version != 4)
-                return 0;
-
-        len = ntohs(iph->tot_len);
-        if (oldskb->len < len)
-                return 0;
-        else if (len < (iph->ihl*4))
-                return 0;
-
-        if (!pskb_may_pull(oldskb, iph->ihl*4))
-                return 0;
-
-        return 1;
-}
-
 static void nft_reject_br_send_v4_tcp_reset(struct sk_buff *oldskb, int hook)
 {
         struct sk_buff *nskb;
@@ -66,7 +43,7 @@ static void nft_reject_br_send_v4_tcp_reset(struct sk_buff *oldskb, int hook)
         const struct tcphdr *oth;
         struct tcphdr _oth;
 
-        if (!nft_reject_iphdr_validate(oldskb))
+        if (!nft_bridge_iphdr_validate(oldskb))
                 return;
 
         oth = nf_reject_ip_tcphdr_get(oldskb, &_oth, hook);
@@ -101,7 +78,7 @@ static void nft_reject_br_send_v4_unreach(struct sk_buff *oldskb, int hook,
         void *payload;
         __wsum csum;
 
-        if (!nft_reject_iphdr_validate(oldskb))
+        if (!nft_bridge_iphdr_validate(oldskb))
                 return;
 
         /* IP header checks: fragment. */
@@ -146,25 +123,6 @@ static void nft_reject_br_send_v4_unreach(struct sk_buff *oldskb, int hook,
         br_deliver(br_port_get_rcu(oldskb->dev), nskb);
 }
 
-static int nft_reject_ip6hdr_validate(struct sk_buff *oldskb)
-{
-        struct ipv6hdr *hdr;
-        u32 pkt_len;
-
-        if (!pskb_may_pull(oldskb, sizeof(struct ipv6hdr)))
-                return 0;
-
-        hdr = ipv6_hdr(oldskb);
-        if (hdr->version != 6)
-                return 0;
-
-        pkt_len = ntohs(hdr->payload_len);
-        if (pkt_len + sizeof(struct ipv6hdr) > oldskb->len)
-                return 0;
-
-        return 1;
-}
-
 static void nft_reject_br_send_v6_tcp_reset(struct net *net,
                                             struct sk_buff *oldskb, int hook)
 {
@@ -174,7 +132,7 @@ static void nft_reject_br_send_v6_tcp_reset(struct net *net,
         unsigned int otcplen;
         struct ipv6hdr *nip6h;
 
-        if (!nft_reject_ip6hdr_validate(oldskb))
+        if (!nft_bridge_ip6hdr_validate(oldskb))
                 return;
 
         oth = nf_reject_ip6_tcphdr_get(oldskb, &_oth, &otcplen, hook);
@@ -207,7 +165,7 @@ static void nft_reject_br_send_v6_unreach(struct net *net,
         unsigned int len;
         void *payload;
 
-        if (!nft_reject_ip6hdr_validate(oldskb))
+        if (!nft_bridge_ip6hdr_validate(oldskb))
                 return;
 
         /* Include "As much of invoking packet as possible without the ICMPv6