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

The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

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

15 files changed, 106 insertions, 39 deletions

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index ab64d9f2eef9..d09173bf9500 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -975,6 +975,8 @@ fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg)
                         val = 65535 - 40;
                 if (type == RTAX_MTU && val > 65535 - 15)
                         val = 65535 - 15;
+                if (type == RTAX_HOPLIMIT && val > 255)
+                        val = 255;
                 if (type == RTAX_FEATURES && (val & ~RTAX_FEATURE_MASK))
                         return -EINVAL;
                 fi->fib_metrics[type - 1] = val;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index aaeb478b54cd..4d2025f7ec57 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -276,7 +276,10 @@ static int __ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi,
                                            raw_proto, false) < 0)
                         goto drop;
 
-                skb_pop_mac_header(skb);
+                if (tunnel->dev->type != ARPHRD_NONE)
+                        skb_pop_mac_header(skb);
+                else
+                        skb_reset_mac_header(skb);
                 if (tunnel->collect_md) {
                         __be16 flags;
                         __be64 tun_id;
@@ -884,6 +887,8 @@ static void ipgre_netlink_parms(struct net_device *dev,
                 struct ip_tunnel *t = netdev_priv(dev);
 
                 t->collect_md = true;
+                if (dev->type == ARPHRD_IPGRE)
+                        dev->type = ARPHRD_NONE;
         }
 }
 
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8daefd8b1b49..b69d84e7a97d 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2658,8 +2658,10 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
          */
         if (unlikely((NET_IP_ALIGN && ((unsigned long)skb->data & 3)) ||
                      skb_headroom(skb) >= 0xFFFF)) {
-                struct sk_buff *nskb = __pskb_copy(skb, MAX_TCP_HEADER,
-                                                   GFP_ATOMIC);
+                struct sk_buff *nskb;
+
+                skb_mstamp_get(&skb->skb_mstamp);
+                nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
                 err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
                              -ENOBUFS;
         } else {
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index c42fa1deb152..969913da494f 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1750,6 +1750,8 @@ static int ip6_convert_metrics(struct mx6_config *mxc,
                 } else {
                         val = nla_get_u32(nla);
                 }
+                if (type == RTAX_HOPLIMIT && val > 255)
+                        val = 255;
                 if (type == RTAX_FEATURES && (val & ~RTAX_FEATURE_MASK))
                         goto err;
 
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 566c64e3ec50..db2312eeb2a4 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -75,6 +75,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_hash);
 static __read_mostly struct kmem_cache *nf_conntrack_cachep;
 static __read_mostly spinlock_t nf_conntrack_locks_all_lock;
 static __read_mostly seqcount_t nf_conntrack_generation;
+static __read_mostly DEFINE_SPINLOCK(nf_conntrack_locks_all_lock);
 static __read_mostly bool nf_conntrack_locks_all;
 
 void nf_conntrack_lock(spinlock_t *lock) __acquires(lock)
diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c
index d016066a25e3..1b4de4bd6958 100644
--- a/net/netfilter/nfnetlink_acct.c
+++ b/net/netfilter/nfnetlink_acct.c
@@ -96,6 +96,8 @@ static int nfnl_acct_new(struct net *net, struct sock *nfnl,
                         return -EINVAL;
                 if (flags & NFACCT_F_OVERQUOTA)
                         return -EINVAL;
+                if ((flags & NFACCT_F_QUOTA) && !tb[NFACCT_QUOTA])
+                        return -EINVAL;
 
                 size += sizeof(u64);
         }
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index 29d2c31f406c..daf45da448fa 100644
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -236,6 +236,7 @@ static void idletimer_tg_destroy(const struct xt_tgdtor_param *par)
 
                 list_del(&info->timer->entry);
                 del_timer_sync(&info->timer->timer);
+                cancel_work_sync(&info->timer->work);
                 sysfs_remove_file(idletimer_tg_kobj, &info->timer->attr.attr);
                 kfree(info->timer->attr.attr.name);
                 kfree(info->timer);
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 9f0bc49fa969..3d5feede962d 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -768,6 +768,19 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
                         return -EINVAL;
                 }
 
+                /* Userspace may decide to perform a ct lookup without a helper
+                 * specified followed by a (recirculate and) commit with one.
+                 * Therefore, for unconfirmed connections which we will commit,
+                 * we need to attach the helper here.
+                 */
+                if (!nf_ct_is_confirmed(ct) && info->commit &&
+                    info->helper && !nfct_help(ct)) {
+                        int err = __nf_ct_try_assign_helper(ct, info->ct,
+                                                            GFP_ATOMIC);
+                        if (err)
+                                return err;
+                }
+
                 /* Call the helper only if:
                  * - nf_conntrack_in() was executed above ("!cached") for a
                  *   confirmed connection, or
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 556f44c9c454..658046dfe02d 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -423,7 +423,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
         u16 ife_type = 0;
         u8 *daddr = NULL;
         u8 *saddr = NULL;
-        int ret = 0;
+        int ret = 0, exists = 0;
         int err;
 
         err = nla_parse_nested(tb, TCA_IFE_MAX, nla, ife_policy);
@@ -435,25 +435,29 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
 
         parm = nla_data(tb[TCA_IFE_PARMS]);
 
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
+
         if (parm->flags & IFE_ENCODE) {
                 /* Until we get issued the ethertype, we cant have
                  * a default..
                 **/
                 if (!tb[TCA_IFE_TYPE]) {
+                        if (exists)
+                                tcf_hash_release(a, bind);
                         pr_info("You MUST pass etherype for encoding\n");
                         return -EINVAL;
                 }
         }
 
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        if (!exists) {
                 ret = tcf_hash_create(tn, parm->index, est, a, sizeof(*ife),
                                       bind, false);
                 if (ret)
                         return ret;
                 ret = ACT_P_CREATED;
         } else {
-                if (bind)       /* dont override defaults */
-                        return 0;
                 tcf_hash_release(a, bind);
                 if (!ovr)
                         return -EEXIST;
@@ -495,6 +499,8 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
                                        NULL);
                 if (err) {
 metadata_parse_err:
+                        if (exists)
+                                tcf_hash_release(a, bind);
                         if (ret == ACT_P_CREATED)
                                 _tcf_ife_cleanup(a, bind);
 
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 1464f6a09446..9f002ada7074 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -96,7 +96,7 @@ static int __tcf_ipt_init(struct tc_action_net *tn, struct nlattr *nla,
         struct tcf_ipt *ipt;
         struct xt_entry_target *td, *t;
         char *tname;
-        int ret = 0, err;
+        int ret = 0, err, exists = 0;
         u32 hook = 0;
         u32 index = 0;
 
@@ -107,18 +107,23 @@ static int __tcf_ipt_init(struct tc_action_net *tn, struct nlattr *nla,
         if (err < 0)
                 return err;
 
-        if (tb[TCA_IPT_HOOK] == NULL)
-                return -EINVAL;
-        if (tb[TCA_IPT_TARG] == NULL)
+        if (tb[TCA_IPT_INDEX] != NULL)
+                index = nla_get_u32(tb[TCA_IPT_INDEX]);
+
+        exists = tcf_hash_check(tn, index, a, bind);
+        if (exists && bind)
+                return 0;
+
+        if (tb[TCA_IPT_HOOK] == NULL || tb[TCA_IPT_TARG] == NULL) {
+                if (exists)
+                        tcf_hash_release(a, bind);
                 return -EINVAL;
+        }
 
         td = (struct xt_entry_target *)nla_data(tb[TCA_IPT_TARG]);
         if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size)
                 return -EINVAL;
 
-        if (tb[TCA_IPT_INDEX] != NULL)
-                index = nla_get_u32(tb[TCA_IPT_INDEX]);
-
         if (!tcf_hash_check(tn, index, a, bind)) {
                 ret = tcf_hash_create(tn, index, est, a, sizeof(*ipt), bind,
                                       false);
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index dea57c1ec90c..7737cdb7d574 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -61,7 +61,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
         struct tc_mirred *parm;
         struct tcf_mirred *m;
         struct net_device *dev;
-        int ret, ok_push = 0;
+        int ret, ok_push = 0, exists = 0;
 
         if (nla == NULL)
                 return -EINVAL;
@@ -71,17 +71,27 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
         if (tb[TCA_MIRRED_PARMS] == NULL)
                 return -EINVAL;
         parm = nla_data(tb[TCA_MIRRED_PARMS]);
+
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
+
         switch (parm->eaction) {
         case TCA_EGRESS_MIRROR:
         case TCA_EGRESS_REDIR:
                 break;
         default:
+                if (exists)
+                        tcf_hash_release(a, bind);
                 return -EINVAL;
         }
         if (parm->ifindex) {
                 dev = __dev_get_by_index(net, parm->ifindex);
-                if (dev == NULL)
+                if (dev == NULL) {
+                        if (exists)
+                                tcf_hash_release(a, bind);
                         return -ENODEV;
+                }
                 switch (dev->type) {
                 case ARPHRD_TUNNEL:
                 case ARPHRD_TUNNEL6:
@@ -99,7 +109,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                 dev = NULL;
         }
 
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        if (!exists) {
                 if (dev == NULL)
                         return -EINVAL;
                 ret = tcf_hash_create(tn, parm->index, est, a,
@@ -108,9 +118,6 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                         return ret;
                 ret = ACT_P_CREATED;
         } else {
-                if (bind)
-                        return 0;
-
                 tcf_hash_release(a, bind);
                 if (!ovr)
                         return -EEXIST;
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 2057fd56d74c..e42f8daca147 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -87,7 +87,7 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
         struct tc_defact *parm;
         struct tcf_defact *d;
         char *defdata;
-        int ret = 0, err;
+        int ret = 0, err, exists = 0;
 
         if (nla == NULL)
                 return -EINVAL;
@@ -99,13 +99,21 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
         if (tb[TCA_DEF_PARMS] == NULL)
                 return -EINVAL;
 
-        if (tb[TCA_DEF_DATA] == NULL)
-                return -EINVAL;
 
         parm = nla_data(tb[TCA_DEF_PARMS]);
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
+
+        if (tb[TCA_DEF_DATA] == NULL) {
+                if (exists)
+                        tcf_hash_release(a, bind);
+                return -EINVAL;
+        }
+
         defdata = nla_data(tb[TCA_DEF_DATA]);
 
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        if (!exists) {
                 ret = tcf_hash_create(tn, parm->index, est, a,
                                       sizeof(*d), bind, false);
                 if (ret)
@@ -122,8 +130,6 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
         } else {
                 d = to_defact(a);
 
-                if (bind)
-                        return 0;
                 tcf_hash_release(a, bind);
                 if (!ovr)
                         return -EEXIST;
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index 51b24998904f..e928802966bc 100644
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -69,7 +69,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
         struct tcf_skbedit *d;
         u32 flags = 0, *priority = NULL, *mark = NULL;
         u16 *queue_mapping = NULL;
-        int ret = 0, err;
+        int ret = 0, err, exists = 0;
 
         if (nla == NULL)
                 return -EINVAL;
@@ -96,12 +96,18 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
                 mark = nla_data(tb[TCA_SKBEDIT_MARK]);
         }
 
-        if (!flags)
-                return -EINVAL;
-
         parm = nla_data(tb[TCA_SKBEDIT_PARMS]);
 
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
+
+        if (!flags) {
+                tcf_hash_release(a, bind);
+                return -EINVAL;
+        }
+
+        if (!exists) {
                 ret = tcf_hash_create(tn, parm->index, est, a,
                                       sizeof(*d), bind, false);
                 if (ret)
@@ -111,8 +117,6 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
                 ret = ACT_P_CREATED;
         } else {
                 d = to_skbedit(a);
-                if (bind)
-                        return 0;
                 tcf_hash_release(a, bind);
                 if (!ovr)
                         return -EEXIST;
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index c1682ab9bc7e..ac4adc812c12 100644
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -77,7 +77,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
         int action;
         __be16 push_vid = 0;
         __be16 push_proto = 0;
-        int ret = 0;
+        int ret = 0, exists = 0;
         int err;
 
         if (!nla)
@@ -90,15 +90,25 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
         if (!tb[TCA_VLAN_PARMS])
                 return -EINVAL;
         parm = nla_data(tb[TCA_VLAN_PARMS]);
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
+
         switch (parm->v_action) {
         case TCA_VLAN_ACT_POP:
                 break;
         case TCA_VLAN_ACT_PUSH:
-                if (!tb[TCA_VLAN_PUSH_VLAN_ID])
+                if (!tb[TCA_VLAN_PUSH_VLAN_ID]) {
+                        if (exists)
+                                tcf_hash_release(a, bind);
                         return -EINVAL;
+                }
                 push_vid = nla_get_u16(tb[TCA_VLAN_PUSH_VLAN_ID]);
-                if (push_vid >= VLAN_VID_MASK)
+                if (push_vid >= VLAN_VID_MASK) {
+                        if (exists)
+                                tcf_hash_release(a, bind);
                         return -ERANGE;
+                }
 
                 if (tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]) {
                         push_proto = nla_get_be16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]);
@@ -114,11 +124,13 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
                 }
                 break;
         default:
+                if (exists)
+                        tcf_hash_release(a, bind);
                 return -EINVAL;
         }
         action = parm->v_action;
 
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        if (!exists) {
                 ret = tcf_hash_create(tn, parm->index, est, a,
                                       sizeof(*v), bind, false);
                 if (ret)
@@ -126,8 +138,6 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
 
                 ret = ACT_P_CREATED;
         } else {
-                if (bind)
-                        return 0;
                 tcf_hash_release(a, bind);
                 if (!ovr)
                         return -EEXIST;
diff --git a/net/x25/x25_facilities.c b/net/x25/x25_facilities.c
index 7ecd04c21360..997ff7b2509b 100644
--- a/net/x25/x25_facilities.c
+++ b/net/x25/x25_facilities.c
@@ -277,6 +277,7 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk,
 
         memset(&theirs, 0, sizeof(theirs));
         memcpy(new, ours, sizeof(*new));
+        memset(dte, 0, sizeof(*dte));
 
         len = x25_parse_facilities(skb, &theirs, dte, &x25->vc_facil_mask);
         if (len < 0)