diff options
| author |   Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2019-07-24 20:00:42 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-24 13:59:25 -0700 |
| commit | 3bc817d665ac6d9de89f59df522ad86f5b5dfc03 (patch) | |
| tree | b0acaaff61f4a996b116e1b49bb8f71c8505db85 /net/ipv6 | |
| parent | net/ipv4: cleanup error condition testing (diff) | |
| download | linux-dev-3bc817d665ac6d9de89f59df522ad86f5b5dfc03.tar.xz linux-dev-3bc817d665ac6d9de89f59df522ad86f5b5dfc03.zip | |
ip6_gre: reload ipv6h in prepare_ip6gre_xmit_ipv6
Since ip6_tnl_parse_tlv_enc_lim() can call pskb_may_pull()
which may change skb->data, so we need to re-load ipv6h at
the right place.
Fixes: 898b29798e36 ("ip6_gre: Refactor ip6gre xmit codes")
Cc: William Tu <u9012063@gmail.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Acked-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index c2049c72f3e5..dd2d0b963260 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -660,12 +660,13 @@ static int prepare_ip6gre_xmit_ipv6(struct sk_buff *skb, struct flowi6 *fl6, __u8 *dsfield, int *encap_limit) { - struct ipv6hdr *ipv6h = ipv6_hdr(skb); + struct ipv6hdr *ipv6h; struct ip6_tnl *t = netdev_priv(dev); __u16 offset; offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb)); /* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */ + ipv6h = ipv6_hdr(skb); if (offset > 0) { struct ipv6_tlv_tnl_enc_lim *tel; |