Commit 11c21a30 authored Jan 23, 2014 by Duan Jiong Committed by David S. Miller Jan 23, 2014

ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called



commit a6222602("ip_tunnel: fix kernel panic with icmp_dest_unreach")
clear IPCB in ip_tunnel_xmit()  , or else skb->cb[] may contain garbage from
GSO segmentation layer.

But commit 0e6fbc5b("ip_tunnels: extend iptunnel_xmit()") refactor codes,
and it clear IPCB behind the dst_link_failure().

So clear IPCB in ip_tunnel_xmit() just like commti a6222602("ip_tunnel:
fix kernel panic with icmp_dest_unreach").

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9fe6cb58

net/ipv4/ip_tunnel.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -686,6 +686,7 @@ void ip_tunnel_xmit(struct sk_buff skb, struct net_device dev,
		tunnel->err_time + IPTUNNEL_ERR_TIMEO)) {
		tunnel->err_count--;

		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
		dst_link_failure(skb);
		} else
		tunnel->err_count = 0;

Admin message