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

Conflicts:
	net/core/rtnetlink.c
	net/core/skbuff.c

Both conflicts were very simple overlapping changes.

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

10 files changed, 32 insertions, 16 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index ed8fe62d41af..ab6c491bd2d3 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6634,6 +6634,9 @@ EXPORT_SYMBOL(unregister_netdevice_queue);
 /**
  *      unregister_netdevice_many - unregister many devices
  *      @head: list of devices
+ *
+ *  Note: As most callers use a stack allocated list_head,
+ *  we force a list_del() to make sure stack wont be corrupted later.
  */
 void unregister_netdevice_many(struct list_head *head)
 {
@@ -6643,6 +6646,7 @@ void unregister_netdevice_many(struct list_head *head)
                 rollback_registered_many(head);
                 list_for_each_entry(dev, head, unreg_list)
                         net_set_todo(dev);
+                list_del(head);
         }
 }
 EXPORT_SYMBOL(unregister_netdevice_many);
@@ -7098,7 +7102,6 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list)
                 }
         }
         unregister_netdevice_many(&dev_kill_list);
-        list_del(&dev_kill_list);
         rtnl_unlock();
 }
 
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 741b22c62acf..233b5ae87583 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1216,6 +1216,8 @@ static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
                                     .len = sizeof(struct ifla_vf_spoofchk) },
         [IFLA_VF_RATE]          = { .type = NLA_BINARY,
                                     .len = sizeof(struct ifla_vf_rate) },
+        [IFLA_VF_LINK_STATE]    = { .type = NLA_BINARY,
+                                    .len = sizeof(struct ifla_vf_link_state) },
 };
 
 static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {
@@ -1770,7 +1772,6 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
 
         ops->dellink(dev, &list_kill);
         unregister_netdevice_many(&list_kill);
-        list_del(&list_kill);
         return 0;
 }
 
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index b9e85e6cb26a..bf92824af3f7 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2885,6 +2885,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
         int pos;
         int dummy;
 
+        __skb_push(head_skb, doffset);
         proto = skb_network_protocol(head_skb, &dummy);
         if (unlikely(!proto))
                 return ERR_PTR(-EINVAL);
@@ -2892,7 +2893,6 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
         csum = !head_skb->encap_hdr_csum &&
             !!can_checksum_protocol(features, proto);
 
-        __skb_push(head_skb, doffset);
         headroom = skb_headroom(head_skb);
         pos = skb_headlen(head_skb);
 
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index 5b499589613f..9acec61f5433 100644
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -149,7 +149,9 @@ int dns_query(const char *type, const char *name, size_t namelen,
         if (!*_result)
                 goto put;
 
-        memcpy(*_result, upayload->data, len + 1);
+        memcpy(*_result, upayload->data, len);
+        *_result[len] = '\0';
+
         if (_expiry)
                 *_expiry = rkey->expiry;
 
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 86a00bd6684c..097b3e7c1e8f 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -268,6 +268,7 @@ static struct ip_tunnel *ip_tunnel_find(struct ip_tunnel_net *itn,
         __be32 remote = parms->iph.daddr;
         __be32 local = parms->iph.saddr;
         __be32 key = parms->i_key;
+        __be16 flags = parms->i_flags;
         int link = parms->link;
         struct ip_tunnel *t = NULL;
         struct hlist_head *head = ip_bucket(itn, parms);
@@ -275,9 +276,9 @@ static struct ip_tunnel *ip_tunnel_find(struct ip_tunnel_net *itn,
         hlist_for_each_entry_rcu(t, head, hash_node) {
                 if (local == t->parms.iph.saddr &&
                     remote == t->parms.iph.daddr &&
-                    key == t->parms.i_key &&
                     link == t->parms.link &&
-                    type == t->dev->type)
+                    type == t->dev->type &&
+                    ip_tunnel_key_match(&t->parms, flags, key))
                         break;
         }
         return t;
@@ -667,6 +668,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
                 dev->needed_headroom = max_headroom;
 
         if (skb_cow_head(skb, dev->needed_headroom)) {
+                ip_rt_put(rt);
                 dev->stats.tx_dropped++;
                 kfree_skb(skb);
                 return;
@@ -746,10 +748,12 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)
                         goto done;
                 if (p->iph.ttl)
                         p->iph.frag_off |= htons(IP_DF);
-                if (!(p->i_flags&TUNNEL_KEY))
-                        p->i_key = 0;
-                if (!(p->o_flags&TUNNEL_KEY))
-                        p->o_key = 0;
+                if (!(p->i_flags & VTI_ISVTI)) {
+                        if (!(p->i_flags & TUNNEL_KEY))
+                                p->i_key = 0;
+                        if (!(p->o_flags & TUNNEL_KEY))
+                                p->o_key = 0;
+                }
 
                 t = ip_tunnel_find(itn, p, itn->fb_tunnel_dev->type);
 
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 13ef00f1e17b..b8960f3527f3 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -313,7 +313,13 @@ vti_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                         return -EINVAL;
         }
 
-        p.i_flags |= VTI_ISVTI;
+        if (!(p.i_flags & GRE_KEY))
+                p.i_key = 0;
+        if (!(p.o_flags & GRE_KEY))
+                p.o_key = 0;
+
+        p.i_flags = VTI_ISVTI;
+
         err = ip_tunnel_ioctl(dev, &p, cmd);
         if (err)
                 return err;
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 4bc508f0db90..62eaa005e146 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -149,13 +149,13 @@ static int ipip_err(struct sk_buff *skb, u32 info)
 
         if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
                 ipv4_update_pmtu(skb, dev_net(skb->dev), info,
-                                 t->dev->ifindex, 0, IPPROTO_IPIP, 0);
+                                 t->parms.link, 0, IPPROTO_IPIP, 0);
                 err = 0;
                 goto out;
         }
 
         if (type == ICMP_REDIRECT) {
-                ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0,
+                ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0,
                               IPPROTO_IPIP, 0);
                 err = 0;
                 goto out;
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index ffa029305a09..5ec867e4a8b7 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -78,6 +78,7 @@ int __ip6_local_out(struct sk_buff *skb)
         if (len > IPV6_MAXPLEN)
                 len = 0;
         ipv6_hdr(skb)->payload_len = htons(len);
+        IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr);
 
         return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL,
                        skb_dst(skb)->dev, dst_output);
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index f4380041f5e7..4f408176dc64 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -560,12 +560,12 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
 
         if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
                 ipv4_update_pmtu(skb, dev_net(skb->dev), info,
-                                 t->dev->ifindex, 0, IPPROTO_IPV6, 0);
+                                 t->parms.link, 0, IPPROTO_IPV6, 0);
                 err = 0;
                 goto out;
         }
         if (type == ICMP_REDIRECT) {
-                ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0,
+                ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0,
                               IPPROTO_IPV6, 0);
                 err = 0;
                 goto out;
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 81a8e2a0b6aa..388b863e821c 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1780,7 +1780,6 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local)
         }
         mutex_unlock(&local->iflist_mtx);
         unregister_netdevice_many(&unreg_list);
-        list_del(&unreg_list);
 
         list_for_each_entry_safe(sdata, tmp, &wdev_list, list) {
                 list_del(&sdata->list);