From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A17BFA04B0 for ; Fri, 1 May 2020 18:16:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 85AC31DAAF; Fri, 1 May 2020 18:16:24 +0200 (CEST) Received: from qq.com (out203-205-251-26.mail.qq.com [203.205.251.26]) by dpdk.org (Postfix) with ESMTP id AC81C1DA71; Fri, 1 May 2020 18:16:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1588349768; bh=Lv/sh5KNCLpU0afVXQxCpviEUzHKHRZdI+oMsUzN2Zc=; h=From:To:Cc:Subject:Date; b=NtGwXcXMdrEaKfDqtGMcrqOGgHlCymPg3QlOo5WyGaYo+MOR6BWpFgYJcywVd5Yai Pbgw9kGHYgn3y4O/t8H6+sDG1NLlbC4fJXtOPTWhPwx3eENqfjk1HFk6/gvoGds7sA hXgjmmAkNl8B7uQzjEVNUzk6nv3f2S9wCKgbwcHc= Received: from localhost.localdomain ([223.64.149.222]) by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP id 4053CE7F; Sat, 02 May 2020 00:16:05 +0800 X-QQ-mid: xmsmtpt1588349765t8iogy8uy X-QQ-XMAILINFO: OT4OJaGfZAuTmjmiiT3NF53msE6L3RBU7FzB46LUxo8l2nrv/tIYSMwNR35O7J XvVVfdsu1g2QCjJdXmd2B6JybIwoddX+jEmZe1WiG2Uxojkf+f60+byQr0fyMT/r5OGrb8p1Kh7z OI7F2uBU1FyQDYUPs3QIdL54jCSVfEC1rF3nYZV13V1JICmZ1fQIqsYeD/jE8PC3cl5tGLOcgbp/ 5G0KkKqaHhDVmucKapBoSzY3gEwDBhr/Ga3J33eEAKpe9N8BPE1eD159mssGpHhz6W4Ti1bJiR74 DpwiCCpFCEiKp3PEaveR5Pe46UWeT559hfzdWTnYuf+luXlkNRy3JOGqD7y142zKO7qpYcSPLMSh GtVfYKpRK2LGT3qziLMR8nhoywYmQdqhHTzFpRMtmK/mmYW65STQ/Ylq/rmDUfk5NOfp6b916fqy WtsxSU9ZmcnpEHUUCbcuaxbCzhx274AhDHCYEIIdfEPDGd8Y9+MuHwY9ObRDS3YQzwdCnJFhcNxZ Ww0gLZS1fTsNt1go30iaTMJVIEOvLUL/970af1ZqwoVrCJkz3HCdmU1/cvYebFWesme5fYjQZXBr I0kl6rjxESTzM5FlIlztqkywhO9AMdLqBcis+CUKSMmBw+A0gTpJwRascq9Tb0S45+aNFOPyHzqX 86jQNMTFivGs8n3lqfttTDAodEVOXrzhRiKyt0vv9y9mHi From: Pu Xu <583493798@qq.com> To: konstantin.ananyev@intel.com Cc: dev@dpdk.org, Pu Xu <583493798@qq.com>, anatoly.burakov@intel.com, stable@dpdk.org Date: Sat, 2 May 2020 00:16:03 +0800 Message-Id: <20200501161603.33907-1-583493798@qq.com> X-Mailer: git-send-email 2.17.0 Subject: [dpdk-stable] [PATCH] ip_frag: fix fragmenting ipv4 packet with header option 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" When fragmenting ipv4 packet, the data offset should be calculated through the ihl field in ip header rather than using sizeof(struct rte_ipv4_hdr). Fixes: 4c38e5532a07 ("ip_frag: refactor IPv4 fragmentation into a proper library") Cc: anatoly.burakov@intel.com Cc: stable@dpdk.org Signed-off-by: Pu Xu <583493798@qq.com> --- lib/librte_ip_frag/rte_ipv4_fragmentation.c | 34 +++++++++++++-------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c index e9de335ae..2e7739d02 100644 --- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c +++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c @@ -23,10 +23,10 @@ #define IPV4_HDR_FO_ALIGN (1 << RTE_IPV4_HDR_FO_SHIFT) static inline void __fill_ipv4hdr_frag(struct rte_ipv4_hdr *dst, - const struct rte_ipv4_hdr *src, uint16_t len, uint16_t fofs, - uint16_t dofs, uint32_t mf) + const struct rte_ipv4_hdr *src, uint16_t header_len, + uint16_t len, uint16_t fofs, uint16_t dofs, uint32_t mf) { - rte_memcpy(dst, src, sizeof(*dst)); + rte_memcpy(dst, src, header_len); fofs = (uint16_t)(fofs + (dofs >> RTE_IPV4_HDR_FO_SHIFT)); fofs = (uint16_t)(fofs | mf << RTE_IPV4_HDR_MF_SHIFT); dst->fragment_offset = rte_cpu_to_be_16(fofs); @@ -74,7 +74,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, struct rte_ipv4_hdr *in_hdr; uint32_t out_pkt_pos, in_seg_data_pos; uint32_t more_in_segs; - uint16_t fragment_offset, flag_offset, frag_size; + uint16_t fragment_offset, flag_offset, frag_size, header_len; uint16_t frag_bytes_remaining; /* @@ -86,14 +86,22 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, unlikely(mtu_size < RTE_ETHER_MIN_MTU)) return -EINVAL; + in_hdr = rte_pktmbuf_mtod(pkt_in, struct rte_ipv4_hdr *); + header_len = (in_hdr->version_ihl & RTE_IPV4_HDR_IHL_MASK) * + RTE_IPV4_IHL_MULTIPLIER; + + /* Check IP header length */ + if (unlikely(pkt_in->data_len < header_len) || + unlikely(mtu_size < header_len)) + return -EINVAL; + /* * Ensure the IP payload length of all fragments is aligned to a * multiple of 8 bytes as per RFC791 section 2.3. */ - frag_size = RTE_ALIGN_FLOOR((mtu_size - sizeof(struct rte_ipv4_hdr)), + frag_size = RTE_ALIGN_FLOOR((mtu_size - header_len), IPV4_HDR_FO_ALIGN); - in_hdr = rte_pktmbuf_mtod(pkt_in, struct rte_ipv4_hdr *); flag_offset = rte_cpu_to_be_16(in_hdr->fragment_offset); /* If Don't Fragment flag is set */ @@ -102,11 +110,11 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, /* Check that pkts_out is big enough to hold all fragments */ if (unlikely(frag_size * nb_pkts_out < - (uint16_t)(pkt_in->pkt_len - sizeof(struct rte_ipv4_hdr)))) + (uint16_t)(pkt_in->pkt_len - header_len))) return -EINVAL; in_seg = pkt_in; - in_seg_data_pos = sizeof(struct rte_ipv4_hdr); + in_seg_data_pos = header_len; out_pkt_pos = 0; fragment_offset = 0; @@ -124,8 +132,8 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, } /* Reserve space for the IP header that will be built later */ - out_pkt->data_len = sizeof(struct rte_ipv4_hdr); - out_pkt->pkt_len = sizeof(struct rte_ipv4_hdr); + out_pkt->data_len = header_len; + out_pkt->pkt_len = header_len; frag_bytes_remaining = frag_size; out_seg_prev = out_pkt; @@ -176,14 +184,14 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, out_hdr = rte_pktmbuf_mtod(out_pkt, struct rte_ipv4_hdr *); - __fill_ipv4hdr_frag(out_hdr, in_hdr, + __fill_ipv4hdr_frag(out_hdr, in_hdr, header_len, (uint16_t)out_pkt->pkt_len, flag_offset, fragment_offset, more_in_segs); fragment_offset = (uint16_t)(fragment_offset + - out_pkt->pkt_len - sizeof(struct rte_ipv4_hdr)); + out_pkt->pkt_len - header_len); - out_pkt->l3_len = sizeof(struct rte_ipv4_hdr); + out_pkt->l3_len = header_len; /* Write the fragment to the output list */ pkts_out[out_pkt_pos] = out_pkt; -- 2.17.0