diff options
| author | Jiri Benc | 2016-05-03 17:10:07 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-05-04 14:11:31 -0400 |
| commit | 244a797bdcf1b74567fa59d7e72d89ed0ee1ffd9 (patch) | |
| tree | 614c17455c3c6690571ca6abf62153841a2c6253 /net/ipv4 | |
| parent | 00b2034029840ddad255352c46db0ae21342ce56 (diff) | |
gre: move iptunnel_pull_header down to ipgre_rcv
This will allow to make the pull dependent on the tunnel type.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_gre.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 8260a707b9b8..8f377dad5489 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -260,7 +260,8 @@ static __be32 tunnel_id_to_key(__be64 x) #endif } -static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi) +static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi, + int hdr_len) { struct net *net = dev_net(skb->dev); struct metadata_dst *tun_dst = NULL; @@ -278,6 +279,9 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi) iph->saddr, iph->daddr, tpi->key); if (tunnel) { + if (iptunnel_pull_header(skb, hdr_len, tpi->proto, false) < 0) + goto drop; + skb_pop_mac_header(skb); if (tunnel->collect_md) { __be16 flags; @@ -294,6 +298,10 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi) return PACKET_RCVD; } return PACKET_REJECT; + +drop: + kfree_skb(skb); + return PACKET_RCVD; } static int gre_rcv(struct sk_buff *skb) @@ -314,10 +322,7 @@ static int gre_rcv(struct sk_buff *skb) if (hdr_len < 0) goto drop; - if (iptunnel_pull_header(skb, hdr_len, tpi.proto, false)) - goto drop; - - if (ipgre_rcv(skb, &tpi) == PACKET_RCVD) + if (ipgre_rcv(skb, &tpi, hdr_len) == PACKET_RCVD) return 0; icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); |