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 C8833235 for ; Tue, 21 Nov 2017 14:27:38 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 4D0B120CB0; Tue, 21 Nov 2017 08:27:37 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:27:38 -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=iSEVuCbTvC4quaTs1 6qsM1U/Tl18ncg8ZUyJvzTU5iA=; b=aTcqp9G+1wU4fUdimcrUilWQQ42lTBSVZ nXsXIPq8iS5MNK61TkqbWm03YZziJe5wjDbAKQ5LvrdKgRgw7KxAFz/x3Tz3SPKU N0A+1yaKUhbvnDZkVoBHnyohHU4k9xtwQr/+bOh58aNVEXMbCfiDkLP6xf96VwKE qLfCyc715Cjq5qbOJEq4UgaKscG0isgFJqj81fi4XcUOaqFY/nLTcM1Yo4Btvaey 2EWbsnEEKlMnXMAS9IL3QZZbEHa7+b5VUoUcaAtk+lcxvAjTkg1aJDt1FpGpoR2i zDdHKlgnPf+CYH35hjbwlDWPa9ceTXq7TMR925hOKQb7zugGdEQww== 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=iSEVuCbTvC4quaTs16qsM1U/Tl18ncg8ZUyJvzTU5iA=; b=CUlSAdH+ 4Ol8/7DBuwPlh6b98E8fsbn21nCn8E2nY1pkDu/c5x0GMmFn6F8oo/VA+913gQFF hUGeRoiamzHTKSoHFDwZ6n5Z7WYzRf8FxPnHSPQNT1USO+tbdXl1FiECvYoiKj4R ABLNL6EKFHQ2SvLPhcgIAU4gaaYWBdSDkyfth1Aa8mSyaqTIsY3XB/Qg0Gr+AjuU 5NH2xnLvkS77zHX4gbs2aYxBw/mtWFbh8UgHTI4Slq7N53YXEV9xaZHfBnUouoKd UzSaQSVN2AEtv8p74Hd9KtV0QCK61dz9HYsRr7CY5NHoCIdDHC6lCcdaUSi1D0dV EBB2oThEDAGqMg== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 1C21024810; Tue, 21 Nov 2017 08:27:34 -0500 (EST) From: Yuanhan Liu To: Tomasz Duszynski Cc: Sergio Gonzalez Monroy , Aviad Yehezkel , dpdk stable Date: Tue, 21 Nov 2017 21:17:53 +0800 Message-Id: <1511270333-31002-131-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 IP version check' 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:39 -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 9c69c762a3857fac47f1769332337215bbc1ad9b Mon Sep 17 00:00:00 2001 From: Tomasz Duszynski Date: Fri, 13 Oct 2017 14:50:09 +0200 Subject: [PATCH] examples/ipsec-secgw: fix IP version check [ upstream commit 3417350e7f1726d6495e0d85e2212f6d4f959e4e ] Since new_ip and ip4 are overlapping buffers copying ip4 over new_ip using memmove() might overwrite memory at ip4. This could happen if following condition holds: ip_hdr_len > sizeof(struct esp_hdr) + sa->iv_len Thus using ip4 to check ip version is wrong as it might not contain proper value. Fixes: f159e70b0922 ("examples/ipsec-secgw: support transport mode") Signed-off-by: Tomasz Duszynski Acked-by: Sergio Gonzalez Monroy Reviewed-by: Aviad Yehezkel --- examples/ipsec-secgw/esp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c index 70bb81f..56ad7a0 100644 --- a/examples/ipsec-secgw/esp.c +++ b/examples/ipsec-secgw/esp.c @@ -306,8 +306,8 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa, sizeof(struct esp_hdr) + sa->iv_len); memmove(new_ip, ip4, ip_hdr_len); esp = (struct esp_hdr *)(new_ip + ip_hdr_len); + ip4 = (struct ip *)new_ip; if (likely(ip4->ip_v == IPVERSION)) { - ip4 = (struct ip *)new_ip; ip4->ip_p = IPPROTO_ESP; ip4->ip_len = htons(rte_pktmbuf_data_len(m)); } else { -- 2.7.4