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

Pablo Neira Ayuso says:

====================
Netfilter/IPVS/OVS fixes for net

The following patchset contains a rather large batch of Netfilter, IPVS
and OVS fixes for your net tree. This includes fixes for ctnetlink, the
userspace conntrack helper infrastructure, conntrack OVS support,
ebtables DNAT target, several leaks in error path among other. More
specifically, they are:

1) Fix reference count leak in the CT target error path, from Gao Feng.

2) Remove conntrack entry clashing with a matching expectation, patch
   from Jarno Rajahalme.

3) Fix bogus EEXIST when registering two different userspace helpers,
   from Liping Zhang.

4) Don't leak dummy elements in the new bitmap set type in nf_tables,
   from Liping Zhang.

5) Get rid of module autoload from conntrack update path in ctnetlink,
   we don't need autoload at this late stage and it is happening with
   rcu read lock held which is not good. From Liping Zhang.

6) Fix deadlock due to double-acquire of the expect_lock from conntrack
   update path, this fixes a bug that was introduced when the central
   spinlock got removed. Again from Liping Zhang.

7) Safe ct->status update from ctnetlink path, from Liping. The expect_lock
   protection that was selected when the central spinlock was removed was
   not really protecting anything at all.

8) Protect sequence adjustment under ct->lock.

9) Missing socket match with IPv6, from Peter Tirsek.

10) Adjust skb->pkt_type of DNAT'ed frames from ebtables, from
    Linus Luessing.

11) Don't give up on evaluating the expression on new entries added via
    dynset expression in nf_tables, from Liping Zhang.

12) Use skb_checksum() when mangling icmpv6 in IPv6 NAT as this deals
    with non-linear skbuffs.

13) Don't allow IPv6 service in IPVS if no IPv6 support is available,
    from Paolo Abeni.

14) Missing mutex release in error path of xt_find_table_lock(), from
    Dan Carpenter.

15) Update maintainers files, Netfilter section. Add Florian to the
    file, refer to nftables.org and change project status from Supported
    to Maintained.

16) Bail out on mismatching extensions in element updates in nf_tables.
====================

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

diff --cc MAINTAINERS
Simple merge

diff --cc include/uapi/linux/netfilter/nf_conntrack_common.h
Simple merge

diff --cc net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/nf_conntrack_helper.c
index 4b9dfe3eef6241756d6474e1f6caad568a942b63,99bcd44aac7080184f58fc883dabac4ac7c1cfa5..3a60efa7799b2e4569af35ce943c67fc354dc68a
--- 1/net/netfilter/nf_conntrack_helper.c
--- 2/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@@ -391,14 -392,27 +391,30 @@@ int nf_conntrack_helper_register(struc
        BUG_ON(me->expect_class_max >= NF_CT_MAX_EXPECT_CLASSES);
        BUG_ON(strlen(me->name) > NF_CT_HELPER_NAME_LEN - 1);
  
 +      if (me->expect_policy->max_expected > NF_CT_EXPECT_MAX_CNT)
 +              return -EINVAL;
 +
        mutex_lock(&nf_ct_helper_mutex);
-       hlist_for_each_entry(cur, &nf_ct_helper_hash[h], hnode) {
-               if (nf_ct_tuple_src_mask_cmp(&cur->tuple, &me->tuple, &mask)) {
-                       ret = -EEXIST;
-                       goto out;
+       for (i = 0; i < nf_ct_helper_hsize; i++) {
+               hlist_for_each_entry(cur, &nf_ct_helper_hash[i], hnode) {
+                       if (!strcmp(cur->name, me->name) &&
+                           (cur->tuple.src.l3num == NFPROTO_UNSPEC ||
+                            cur->tuple.src.l3num == me->tuple.src.l3num) &&
+                           cur->tuple.dst.protonum == me->tuple.dst.protonum) {
+                               ret = -EEXIST;
+                               goto out;
+                       }
+               }
+       }
+ 
+       /* avoid unpredictable behaviour for auto_assign_helper */
+       if (!(me->flags & NF_CT_HELPER_F_USERSPACE)) {
+               hlist_for_each_entry(cur, &nf_ct_helper_hash[h], hnode) {
+                       if (nf_ct_tuple_src_mask_cmp(&cur->tuple, &me->tuple,
+                                                    &mask)) {
+                               ret = -EEXIST;
+                               goto out;
+                       }
                }
        }
        hlist_add_head_rcu(&me->hnode, &nf_ct_helper_hash[h]);

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/nft_dynset.c
Simple merge

diff --cc net/netfilter/xt_CT.c
Simple merge

diff --cc net/openvswitch/conntrack.c
Simple merge