ipv4: fix nexthop attlen check in fib_nh_match

[pandora-kernel.git] / net / ipv4 / ip_tunnel.c

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index b75b47b..0bb8e14 100644 (file)
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -56,6 +56,7 @@
 #include <net/netns/generic.h>
 #include <net/rtnetlink.h>
 #include <net/udp.h>
+#include <net/gue.h>
 
 #if IS_ENABLED(CONFIG_IPV6)
 #include <net/ipv6.h>
@@ -495,6 +496,8 @@ static int ip_encap_hlen(struct ip_tunnel_encap *e)
                return 0;
        case TUNNEL_ENCAP_FOU:
                return sizeof(struct udphdr);
+       case TUNNEL_ENCAP_GUE:
+               return sizeof(struct udphdr) + sizeof(struct guehdr);
        default:
                return -EINVAL;
        }
@@ -546,6 +549,15 @@ static int fou_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,
        skb_reset_transport_header(skb);
        uh = udp_hdr(skb);
 
+       if (e->type == TUNNEL_ENCAP_GUE) {
+               struct guehdr *guehdr = (struct guehdr *)&uh[1];
+
+               guehdr->version = 0;
+               guehdr->hlen = 0;
+               guehdr->flags = 0;
+               guehdr->next_hdr = *protocol;
+       }
+
        uh->dest = e->dport;
        uh->source = sport;
        uh->len = htons(skb->len);
@@ -565,6 +577,7 @@ int ip_tunnel_encap(struct sk_buff *skb, struct ip_tunnel *t,
        case TUNNEL_ENCAP_NONE:
                return 0;
        case TUNNEL_ENCAP_FOU:
+       case TUNNEL_ENCAP_GUE:
                return fou_build_header(skb, &t->encap, t->encap_hlen,
                                        protocol, fl4);
        default:
@@ -759,7 +772,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
                df |= (inner_iph->frag_off&htons(IP_DF));
 
        max_headroom = LL_RESERVED_SPACE(rt->dst.dev) + sizeof(struct iphdr)
-                       + rt->dst.header_len;
+                       + rt->dst.header_len + ip_encap_hlen(&tunnel->encap);
        if (max_headroom > dev->needed_headroom)
                dev->needed_headroom = max_headroom;
 
@@ -853,9 +866,14 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)
 
                t = ip_tunnel_find(itn, p, itn->fb_tunnel_dev->type);
 
-               if (!t && (cmd == SIOCADDTUNNEL)) {
-                       t = ip_tunnel_create(net, itn, p);
-                       err = PTR_ERR_OR_ZERO(t);
+               if (cmd == SIOCADDTUNNEL) {
+                       if (!t) {
+                               t = ip_tunnel_create(net, itn, p);
+                               err = PTR_ERR_OR_ZERO(t);
+                               break;
+                       }
+
+                       err = -EEXIST;
                        break;
                }
                if (dev != itn->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) {