| Message ID | 1391606194-3133-1-git-send-email-luis.henriques@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index ffc2108..b6829f4 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -621,6 +621,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;
This is a note to let you know that I have just added a patch titled ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.11.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ------ From 0dcc6ccfd7b785500a94dc326a91cf31679dff5a Mon Sep 17 00:00:00 2001 From: Duan Jiong <duanj.fnst@cn.fujitsu.com> Date: Thu, 23 Jan 2014 14:00:25 +0800 Subject: ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called commit 11c21a307d79ea5f6b6fc0d3dfdeda271e5e65f6 upstream. 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> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- net/ipv4/ip_tunnel.c | 1 + 1 file changed, 1 insertion(+) -- 1.8.3.2