Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934801AbcLMT45 (ORCPT ); Tue, 13 Dec 2016 14:56:57 -0500 Received: from mx2.suse.de ([195.135.220.15]:54223 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935267AbcLMTxT (ORCPT ); Tue, 13 Dec 2016 14:53:19 -0500 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Eli Cooper , "David S . Miller" , Jiri Slaby Subject: [PATCH 3.12 25/38] ipv6: Set skb->protocol properly for local output Date: Tue, 13 Dec 2016 20:52:51 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: <15034b96ec06ee859b67c6cd4e3be569a4ef286b.1481658746.git.jslaby@suse.cz> References: <15034b96ec06ee859b67c6cd4e3be569a4ef286b.1481658746.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1203 Lines: 40 From: Eli Cooper 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit b4e479a96fc398ccf83bb1cffb4ffef8631beaf1 upstream. When xfrm is applied to TSO/GSO packets, it follows this path: xfrm_output() -> xfrm_output_gso() -> skb_gso_segment() where skb_gso_segment() relies on skb->protocol to function properly. This patch sets skb->protocol to ETH_P_IPV6 before dst_output() is called, fixing a bug where GSO packets sent through an ipip6 tunnel are dropped when xfrm is involved. Signed-off-by: Eli Cooper Signed-off-by: David S. Miller Signed-off-by: Jiri Slaby --- net/ipv6/output_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c index 4bd870af05d6..ab40997a1c2a 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c @@ -117,6 +117,8 @@ int __ip6_local_out(struct sk_buff *skb) len = 0; ipv6_hdr(skb)->payload_len = htons(len); + skb->protocol = htons(ETH_P_IPV6); + return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, skb_dst(skb)->dev, dst_output); } -- 2.11.0