geneve: fix ip_hdr_len reserved for geneve6 tunnel.

Haishuang Yan · davem330 · commit 31ac1c19455f · 2016-11-28T16:14:49.000-05:00
It shold reserved sizeof(ipv6hdr) for geneve in ipv6 tunnel. Fixes: c3ef5aa ('geneve: Merge ipv4 and ipv6 geneve_build_skb()') Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Acked-by: Pravin B Shelar <pshelar@ovn.org> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
@@ -852,7 +852,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
 					   ip_hdr(skb), skb);
 		ttl = key->ttl ? : ip6_dst_hoplimit(dst);
 	}
-	err = geneve_build_skb(dst, skb, info, xnet, sizeof(struct iphdr));
+	err = geneve_build_skb(dst, skb, info, xnet, sizeof(struct ipv6hdr));
 	if (unlikely(err))
 		return err;
 

Original file line number	Diff line number	Diff line change
`@@ -852,7 +852,7 @@ static int geneve6_xmit_skb(struct sk_buff skb, struct net_device dev,`
`852`	`852`	`ip_hdr(skb), skb);`
`853`	`853`	`ttl = key->ttl ? : ip6_dst_hoplimit(dst);`
`854`	`854`	`}`
`855`		`- err = geneve_build_skb(dst, skb, info, xnet, sizeof(struct iphdr));`
	`855`	`+ err = geneve_build_skb(dst, skb, info, xnet, sizeof(struct ipv6hdr));`
`856`	`856`	`if (unlikely(err))`
`857`	`857`	`return err;`
`858`	`858`