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

[sfrench/cifs-2.6.git] / net / ipv4 / ip_gre.c

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index a8772a97822421116525561e483dce81cbb17597..2d8efeecf61976f00c0700cc7f64f749b9482a73 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -578,6 +578,8 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev,
        int tunnel_hlen;
        int version;
        __be16 df;
+       int nhoff;
+       int thoff;
 
        tun_info = skb_tunnel_info(skb);
        if (unlikely(!tun_info || !(tun_info->mode & IP_TUNNEL_INFO_TX) ||
@@ -605,6 +607,16 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev,
                truncate = true;
        }
 
+       nhoff = skb_network_header(skb) - skb_mac_header(skb);
+       if (skb->protocol == htons(ETH_P_IP) &&
+           (ntohs(ip_hdr(skb)->tot_len) > skb->len - nhoff))
+               truncate = true;
+
+       thoff = skb_transport_header(skb) - skb_mac_header(skb);
+       if (skb->protocol == htons(ETH_P_IPV6) &&
+           (ntohs(ipv6_hdr(skb)->payload_len) > skb->len - thoff))
+               truncate = true;
+
        if (version == 1) {
                erspan_build_header(skb, ntohl(tunnel_id_to_key32(key->tun_id)),
                                    ntohl(md->u.index), truncate, true);
@@ -722,10 +734,12 @@ static netdev_tx_t erspan_xmit(struct sk_buff *skb,
                erspan_build_header(skb, ntohl(tunnel->parms.o_key),
                                    tunnel->index,
                                    truncate, true);
-       else
+       else if (tunnel->erspan_ver == 2)
                erspan_build_header_v2(skb, ntohl(tunnel->parms.o_key),
                                       tunnel->dir, tunnel->hwid,
                                       truncate, true);
+       else
+               goto free_skb;
 
        tunnel->parms.o_flags &= ~TUNNEL_KEY;
        __gre_xmit(skb, dev, &tunnel->parms.iph, htons(ETH_P_ERSPAN));
@@ -781,8 +795,14 @@ static void ipgre_link_update(struct net_device *dev, bool set_mtu)
                    tunnel->encap.type == TUNNEL_ENCAP_NONE) {
                        dev->features |= NETIF_F_GSO_SOFTWARE;
                        dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+               } else {
+                       dev->features &= ~NETIF_F_GSO_SOFTWARE;
+                       dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
                }
                dev->features |= NETIF_F_LLTX;
+       } else {
+               dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
+               dev->features &= ~(NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE);
        }
 }