| Message ID | 52E0AFF9.6050803@cn.fujitsu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Duan Jiong <duanj.fnst@cn.fujitsu.com> Date: Thu, 23 Jan 2014 14:00:25 +0800 > > commit a622260254ee48("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 0e6fbc5b6c621("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 a622260254ee48("ip_tunnel: > fix kernel panic with icmp_dest_unreach"). > > Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 90ff957..471c8c1 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -618,6 +618,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;
commit a622260254ee48("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 0e6fbc5b6c621("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 a622260254ee48("ip_tunnel: fix kernel panic with icmp_dest_unreach"). Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> --- v2: add the memset() before the dst_link_failure() call net/ipv4/ip_tunnel.c | 1 + 1 file changed, 1 insertion(+)