From patchwork Wed Feb 5 13:16:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 317124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 0134D2C0081 for ; Thu, 6 Feb 2014 00:23:26 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WB2Rk-0004vD-KR; Wed, 05 Feb 2014 13:23:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WB2LE-0001gN-8H for kernel-team@lists.ubuntu.com; Wed, 05 Feb 2014 13:16:36 +0000 Received: from bl15-104-80.dsl.telepac.pt ([188.80.104.80] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1WB2LE-0004NW-0q; Wed, 05 Feb 2014 13:16:36 +0000 From: Luis Henriques To: Duan Jiong Subject: [3.11.y.z extended stable] Patch "ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure()" has been added to staging queue Date: Wed, 5 Feb 2014 13:16:34 +0000 Message-Id: <1391606194-3133-1-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.3.2 X-Extended-Stable: 3.11 Cc: kernel-team@lists.ubuntu.com, "David S. Miller" X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 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 Signed-off-by: David S. Miller Signed-off-by: Luis Henriques --- net/ipv4/ip_tunnel.c | 1 + 1 file changed, 1 insertion(+) -- 1.8.3.2 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;