From mboxrd@z Thu Jan 1 00:00:00 1970 From: ilant@mellanox.com Subject: [PATCH net-next 3/7] xfrm6: Fix CHECKSUM_COMPLETE after IPv6 header push Date: Tue, 1 Aug 2017 12:49:06 +0300 Message-ID: <20170801094910.14895-4-ilant@mellanox.com> References: <20170801094910.14895-1-ilant@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Yossi Kuperman , Ilan Tayari To: Steffen Klassert , netdev@vger.kernel.org Return-path: Received: from mail-eopbgr50051.outbound.protection.outlook.com ([40.107.5.51]:57152 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751352AbdHAJt5 (ORCPT ); Tue, 1 Aug 2017 05:49:57 -0400 In-Reply-To: <20170801094910.14895-1-ilant@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Yossi Kuperman xfrm6_transport_finish rebuilds the IPv6 header based on the original one and pushes it back without fixing skb->csum. Therefore, CHECKSUM_COMPLETE is no longer valid and the packet gets dropped. Fix skb->csum by calling skb_postpush_rcsum. Note: A valid IPv4 header has checksum 0, unlike IPv6. Thus, the change is not needed in the sibling xfrm4_transport_finish function. Signed-off-by: Yossi Kuperman Signed-off-by: Ilan Tayari --- net/ipv6/xfrm6_input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c index 3ef5d913e7a3..f95943a13abc 100644 --- a/net/ipv6/xfrm6_input.c +++ b/net/ipv6/xfrm6_input.c @@ -34,6 +34,7 @@ EXPORT_SYMBOL(xfrm6_rcv_spi); int xfrm6_transport_finish(struct sk_buff *skb, int async) { struct xfrm_offload *xo = xfrm_offload(skb); + int nhlen = skb->data - skb_network_header(skb); skb_network_header(skb)[IP6CB(skb)->nhoff] = XFRM_MODE_SKB_CB(skb)->protocol; @@ -43,8 +44,9 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async) return 1; #endif - __skb_push(skb, skb->data - skb_network_header(skb)); + __skb_push(skb, nhlen); ipv6_hdr(skb)->payload_len = htons(skb->len - sizeof(struct ipv6hdr)); + skb_postpush_rcsum(skb, skb_network_header(skb), nhlen); if (xo && (xo->flags & XFRM_GRO)) { skb_mac_header_rebuild(skb); -- 2.11.0