From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 9DC73235 for ; Tue, 21 Nov 2017 14:27:45 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 51F2B2094B; Tue, 21 Nov 2017 08:27:45 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:27:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=NdF32F/3Q617AwnF+ lJ5R6qGMDH709c7zLXxsVR9ghQ=; b=Pj9pNAKNh8RAEAcEvNZucfVv8MYEQlGhf EkG3akp4TWcUlERIyTPTw6M/OJwqesVlkZBXlbKCfqiNMByZEkj325O6thnZZePO UhwYEjl8x5TbokmNk7wd+any8vqYKmyoCiyuNrV++eOFR/L8DSnLwXuescUSvDuv epY8FxrrzAZAURwZZkywTq094FX1kaHOibpKDZ8+9TxjhcP98je0DkDLsozSVmj8 8sQ28HxES9Tovxsb9C/Wx+pyKs7L9moeTr9lzTQ2e13SZt6izH90TLvhXjqqF/m5 cfDU5o320NuaI2jGygfFm52LliCGhvwDyXYlCu7/Td+Vz3ijok7+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=NdF32F/3Q617AwnF+lJ5R6qGMDH709c7zLXxsVR9ghQ=; b=icil13wG DXcgVQQEG5S7TXv+wh9zQKu4SJqymf+Ynp6dC2IAw9srobcbAv4WbYZxC0bTjte8 RW7HUC94e+mqYPNcGJmQKG3/oN1RH5dN/za501yq8kWlItuyJ5jmXxEKpNIpAz61 f6le97bfvbrx2lepA1hRGL7tm9ZfBLEKi2htUFLMAps3/AMbDKueG6RcaNDwff5g ofqL0RFIcDM9Z25hW56FXRS3V1cTUm7Q66pJ40KLB1APSdVd7xTfbojityNKp+an MCOBoMm14r2YGRwh8dvhXO+ZN/roGItXA7sclHdy6nxG7Douj/NarhXUWL890PoV ZTbgWl6Z009X/A== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id C6F49247A9; Tue, 21 Nov 2017 08:27:41 -0500 (EST) From: Yuanhan Liu To: Tomasz Duszynski Cc: Sergio Gonzalez Monroy , dpdk stable Date: Tue, 21 Nov 2017 21:17:55 +0800 Message-Id: <1511270333-31002-133-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'examples/ipsec-secgw: fix IPv6 payload length' has been queued to stable release 17.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 13:27:45 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From c4729ac031f3a79afad358506d7b2adbb141ae50 Mon Sep 17 00:00:00 2001 From: Tomasz Duszynski Date: Fri, 13 Oct 2017 10:04:36 +0200 Subject: [PATCH] examples/ipsec-secgw: fix IPv6 payload length [ upstream commit b43a81319b2411bbdb96bd349cd3cdfd66714777 ] IPv6 payload length header field should contain only the number of bytes following the IPv6 header and not the entire packet size. Fixes: f159e70b0922 ("examples/ipsec-secgw: support transport mode") Fixes: 906257e965b7 ("examples/ipsec-secgw: support IPv6") Signed-off-by: Tomasz Duszynski Acked-by: Sergio Gonzalez Monroy --- examples/ipsec-secgw/esp.c | 6 ++++-- examples/ipsec-secgw/ipip.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c index 56ad7a0..063e63f 100644 --- a/examples/ipsec-secgw/esp.c +++ b/examples/ipsec-secgw/esp.c @@ -211,7 +211,8 @@ esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa, /* XXX No option headers supported */ memmove(ip6, ip, sizeof(struct ip6_hdr)); ip6->ip6_nxt = *nexthdr; - ip6->ip6_plen = htons(rte_pktmbuf_data_len(m)); + ip6->ip6_plen = htons(rte_pktmbuf_data_len(m) - + sizeof(struct ip6_hdr)); } } else ipip_inbound(m, sizeof(struct esp_hdr) + sa->iv_len); @@ -313,7 +314,8 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa, } else { ip6 = (struct ip6_hdr *)new_ip; ip6->ip6_nxt = IPPROTO_ESP; - ip6->ip6_plen = htons(rte_pktmbuf_data_len(m)); + ip6->ip6_plen = htons(rte_pktmbuf_data_len(m) - + sizeof(struct ip6_hdr)); } } diff --git a/examples/ipsec-secgw/ipip.h b/examples/ipsec-secgw/ipip.h index ff1dccd..93393d5 100644 --- a/examples/ipsec-secgw/ipip.h +++ b/examples/ipsec-secgw/ipip.h @@ -72,7 +72,8 @@ ipip_outbound(struct rte_mbuf *m, uint32_t offset, uint32_t is_ipv6, /* Per RFC4301 5.1.2.1 */ outip6->ip6_flow = htonl(IP6_VERSION << 28 | ds_ecn << 20); - outip6->ip6_plen = htons(rte_pktmbuf_data_len(m)); + outip6->ip6_plen = htons(rte_pktmbuf_data_len(m) - + sizeof(struct ip6_hdr)); outip6->ip6_nxt = IPPROTO_ESP; outip6->ip6_hops = IPDEFTTL; -- 2.7.4