Commit 3bc817d6 authored Jul 24, 2019 by Haishuang Yan Committed by David S. Miller Jul 24, 2019

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: 898b2979 ("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>

parent c7148c03

net/ipv6/ip6_gre.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;