diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2018-09-24 15:48:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-24 12:27:04 -0700 |
| commit | ccfec9e5cb2d48df5a955b7bf47f7782157d3bc2 (patch) | |
| tree | f2dd5acfe96ba9b9c424659e8a6eff96735c3ad4 /net | |
| parent | d8e2262a5044c1a05b4da51e5d0976f10c487a9f (diff) | |
| download | linux-stable-ccfec9e5cb2d48df5a955b7bf47f7782157d3bc2.tar.gz linux-stable-ccfec9e5cb2d48df5a955b7bf47f7782157d3bc2.tar.bz2 linux-stable-ccfec9e5cb2d48df5a955b7bf47f7782157d3bc2.zip | |
ip_tunnel: be careful when accessing the inner header
Cong noted that we need the same checks introduced by commit 76c0ddd8c3a6
("ip6_tunnel: be careful when accessing the inner header")
even for ipv4 tunnels.
Fixes: c54419321455 ("GRE: Refactor GRE tunneling code.")
Suggested-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index c4f5602308ed..284a22154b4e 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -627,6 +627,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, const struct iphdr *tnl_params, u8 protocol) { struct ip_tunnel *tunnel = netdev_priv(dev); + unsigned int inner_nhdr_len = 0; const struct iphdr *inner_iph; struct flowi4 fl4; u8 tos, ttl; @@ -636,6 +637,14 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, __be32 dst; bool connected; + /* ensure we can access the inner net header, for several users below */ + if (skb->protocol == htons(ETH_P_IP)) + inner_nhdr_len = sizeof(struct iphdr); + else if (skb->protocol == htons(ETH_P_IPV6)) + inner_nhdr_len = sizeof(struct ipv6hdr); + if (unlikely(!pskb_may_pull(skb, inner_nhdr_len))) + goto tx_error; + inner_iph = (const struct iphdr *)skb_inner_network_header(skb); connected = (tunnel->parms.iph.daddr != 0); |