Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

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

6 files changed, 20 insertions, 13 deletions

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 8c067e6663a1..95e757c377f9 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -891,7 +891,7 @@ config NETFILTER_XT_TARGET_TEE
         depends on IPV6 || IPV6=n
         depends on !NF_CONNTRACK || NF_CONNTRACK
         select NF_DUP_IPV4
-        select NF_DUP_IPV6 if IP6_NF_IPTABLES != n
+        select NF_DUP_IPV6 if IPV6
         ---help---
         This option adds a "TEE" target with which a packet can be cloned and
         this clone be rerouted to another nexthop.
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 58882de06bd7..f60b4fdeeb8c 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1412,6 +1412,7 @@ get_next_corpse(struct net *net, int (*iter)(struct nf_conn *i, void *data),
                 }
                 spin_unlock(lockp);
                 local_bh_enable();
+                cond_resched();
         }
 
         for_each_possible_cpu(cpu) {
@@ -1424,6 +1425,7 @@ get_next_corpse(struct net *net, int (*iter)(struct nf_conn *i, void *data),
                                 set_bit(IPS_DYING_BIT, &ct->status);
                 }
                 spin_unlock_bh(&pcpu->lock);
+                cond_resched();
         }
         return NULL;
 found:
@@ -1440,6 +1442,8 @@ void nf_ct_iterate_cleanup(struct net *net,
         struct nf_conn *ct;
         unsigned int bucket = 0;
 
+        might_sleep();
+
         while ((ct = get_next_corpse(net, iter, data, &bucket)) != NULL) {
                 /* Time to push up daises... */
                 if (del_timer(&ct->timeout))
@@ -1448,6 +1452,7 @@ void nf_ct_iterate_cleanup(struct net *net,
                 /* ... else the timer will get him soon. */
 
                 nf_ct_put(ct);
+                cond_resched();
         }
 }
 EXPORT_SYMBOL_GPL(nf_ct_iterate_cleanup);
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 9a99f686d06f..2278d9ab723b 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -304,14 +304,14 @@ replay:
 #endif
                 {
                         nfnl_unlock(subsys_id);
-                        netlink_ack(skb, nlh, -EOPNOTSUPP);
+                        netlink_ack(oskb, nlh, -EOPNOTSUPP);
                         return kfree_skb(skb);
                 }
         }
 
         if (!ss->commit || !ss->abort) {
                 nfnl_unlock(subsys_id);
-                netlink_ack(skb, nlh, -EOPNOTSUPP);
+                netlink_ack(oskb, nlh, -EOPNOTSUPP);
                 return kfree_skb(skb);
         }
 
@@ -321,10 +321,12 @@ replay:
                 nlh = nlmsg_hdr(skb);
                 err = 0;
 
-                if (nlmsg_len(nlh) < sizeof(struct nfgenmsg) ||
-                    skb->len < nlh->nlmsg_len) {
-                        err = -EINVAL;
-                        goto ack;
+                if (nlh->nlmsg_len < NLMSG_HDRLEN ||
+                    skb->len < nlh->nlmsg_len ||
+                    nlmsg_len(nlh) < sizeof(struct nfgenmsg)) {
+                        nfnl_err_reset(&err_list);
+                        status |= NFNL_BATCH_FAILURE;
+                        goto done;
                 }
 
                 /* Only requests are handled by the kernel */
@@ -399,7 +401,7 @@ ack:
                                  * pointing to the batch header.
                                  */
                                 nfnl_err_reset(&err_list);
-                                netlink_ack(skb, nlmsg_hdr(oskb), -ENOMEM);
+                                netlink_ack(oskb, nlmsg_hdr(oskb), -ENOMEM);
                                 status |= NFNL_BATCH_FAILURE;
                                 goto done;
                         }
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index 94837d236ab0..2671b9deb103 100644
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -312,7 +312,7 @@ static void ctnl_untimeout(struct net *net, struct ctnl_timeout *timeout)
                         hlist_nulls_for_each_entry(h, nn, &net->ct.hash[i], hnnode)
                                 untimeout(h, timeout);
                 }
-                nf_conntrack_lock(&nf_conntrack_locks[i % CONNTRACK_LOCKS]);
+                spin_unlock(&nf_conntrack_locks[i % CONNTRACK_LOCKS]);
         }
         local_bh_enable();
 }
diff --git a/net/netfilter/nft_counter.c b/net/netfilter/nft_counter.c
index c7808fc19719..c9743f78f219 100644
--- a/net/netfilter/nft_counter.c
+++ b/net/netfilter/nft_counter.c
@@ -100,7 +100,7 @@ static int nft_counter_init(const struct nft_ctx *ctx,
 
         cpu_stats = netdev_alloc_pcpu_stats(struct nft_counter_percpu);
         if (cpu_stats == NULL)
-                return ENOMEM;
+                return -ENOMEM;
 
         preempt_disable();
         this_cpu = this_cpu_ptr(cpu_stats);
@@ -138,7 +138,7 @@ static int nft_counter_clone(struct nft_expr *dst, const struct nft_expr *src)
         cpu_stats = __netdev_alloc_pcpu_stats(struct nft_counter_percpu,
                                               GFP_ATOMIC);
         if (cpu_stats == NULL)
-                return ENOMEM;
+                return -ENOMEM;
 
         preempt_disable();
         this_cpu = this_cpu_ptr(cpu_stats);
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c
index 3eff7b67cdf2..6e57a3966dc5 100644
--- a/net/netfilter/xt_TEE.c
+++ b/net/netfilter/xt_TEE.c
@@ -38,7 +38,7 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
         return XT_CONTINUE;
 }
 
-#if IS_ENABLED(CONFIG_NF_DUP_IPV6)
+#if IS_ENABLED(CONFIG_IPV6)
 static unsigned int
 tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
 {
@@ -131,7 +131,7 @@ static struct xt_target tee_tg_reg[] __read_mostly = {
                 .destroy    = tee_tg_destroy,
                 .me         = THIS_MODULE,
         },
-#if IS_ENABLED(CONFIG_NF_DUP_IPV6)
+#if IS_ENABLED(CONFIG_IPV6)
         {
                 .name       = "TEE",
                 .revision   = 1,