From patchwork Fri Oct 13 12:50:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 30358 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 595B91B6CA; Fri, 13 Oct 2017 14:50:22 +0200 (CEST) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by dpdk.org (Postfix) with ESMTP id 59F371B6BE for ; Fri, 13 Oct 2017 14:50:19 +0200 (CEST) Received: by mail-lf0-f44.google.com with SMTP id b190so9501790lfg.9 for ; Fri, 13 Oct 2017 05:50:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=JphIQodr5aRwc2QPU6kt9IZNfnmnt+ayglMF77E+qe0=; b=tt+OMIyMfG5Mx20PYibubX8nnuxkrwWdcWuq6WoroK0xsjCG9AtJPBgCIrLWCqEbBE N8nKet1tkuwcz7HuLY98QcbooDye2EHwsOhEuIuZa2QNrVsXv4QbC0eLauUDfCggSqTI Ko3Yit8DsOX6ZTTDUDSUo1RoU6gCY2JTKBT01ZLUC704J79IowbWUzWoPsvWf44i1mTD d+VLntLRR8vvUiEhFxHz8riJlkv9oRbe7e+OHNbnm2Qcynwlf6JYuOfy97i3iaCoQox3 hl+LKT2vqWCp9XH/SFgrS5zd75LXggZgd5YyZ7+LRlJj2j0UA2oz5kjlH/vGMuS1EHPR zqgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JphIQodr5aRwc2QPU6kt9IZNfnmnt+ayglMF77E+qe0=; b=SK5s85u4QdRJULlLrsEG3XZygS2L4MDsOwwdyjKpBkvywMgTb8qPHbSpIjZwr8Som7 0F6/11VexZIt9yCH2RntyM8yQpjfjprkhHHgRoiZTvkK7x9ceJr1ZKifyWIiYIWbZ5Fk V9485ojK9yW3WbjlbPsemBkaFB07DW7SSAa75hv5sUzrMUNBFtX5CJ4Z83QZzcH+TDvv N3wYJk9mg/nDAkp3ZP6v8DtpJ8WljaKNT83P+OnzcqUCA+KTWSTXg9B9w5kkUWAMqR5h xjxzEgluqVMZied9UBj6c11llH/xwVonJkTOMTYrl/qDjXOkx+vwLltcKbSDk5YKuijX Enpg== X-Gm-Message-State: AMCzsaUexodpkfWtPK55zznKIoiqOWSGfTIXmA9kDK1pZ/n4JvZuUFRp riEoiI7okUMfEtbzjVcM2MYer8gMt8g= X-Google-Smtp-Source: ABhQp+Rwhx3hhjEu95yjz0ubNdZ+USUnk0u8IUv26aTttpSvNs67AVgl2oKVTv+o+ouXUB/6h3dFVQ== X-Received: by 10.46.41.152 with SMTP id p24mr619503ljp.173.1507899019398; Fri, 13 Oct 2017 05:50:19 -0700 (PDT) Received: from tdu.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id 34sm169875lfr.25.2017.10.13.05.50.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Oct 2017 05:50:18 -0700 (PDT) From: Tomasz Duszynski To: dev@dpdk.org Cc: Tomasz Duszynski , stable@dpdk.org Date: Fri, 13 Oct 2017 14:50:09 +0200 Message-Id: <1507899009-20393-1-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] examples/ipsec-secgw: fix ip version check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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") Cc: stable@dpdk.org 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 2897840..063e63f 100644 --- a/examples/ipsec-secgw/esp.c +++ b/examples/ipsec-secgw/esp.c @@ -307,8 +307,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 {