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 554E6A04AD; Fri, 1 May 2020 15:50:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC7811DA1B; Fri, 1 May 2020 15:50:31 +0200 (CEST) Received: from qq.com (out203-205-221-164.mail.qq.com [203.205.221.164]) by dpdk.org (Postfix) with ESMTP id 6910D1DA08; Fri, 1 May 2020 15:50:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1588341023; bh=RL06wqfayyNL9OFIuxGaDexMC4QVdXgp42sEcuv0yKk=; h=From:To:Cc:Subject:Date; b=DOufBfZ4TwfHHnlQzXDnEtzGRYX9Cw1yfPsU3rGNZU2WO3O16LBMrYL6phC2PDyph +5CHcvaDmvtxterwVKfhYSFISmMAH8jb5Zd/iCN5PxydPEAnKOwVK0kIcOuTReJ33x Xq62ij5w4wUz1qubRceC2axM/lvIeoi9L0VXGpkU= Received: from localhost.localdomain ([223.64.149.222]) by newxmesmtplogicsvrszb5.qq.com (NewEsmtp) with SMTP id C938D661; Fri, 01 May 2020 21:50:19 +0800 X-QQ-mid: xmsmtpt1588341019tsoq7xx0e X-QQ-XMAILINFO: Mbz8up4iCj6IgbXRmHt6ilM4uTJ8lQHv/OJMO/PvWO761DhCPuxMTQrmarlZSu eJo8kdj+6RXKpVAoc8CqFbaI/WENUXv2Rxta6jM00A4sspLXAr33I0uwpO374yUecZtzZ/u6yX/X 9Yz51E3Uf7JHJdHs14tiUCKVo5JQ9UQoxKzzOZRdoU18pOZO7dwrLAku8etNUHlBO81Ymp+LJ0iz C4Z6fNEP/m9bXTABaF1rMLXRw+rtSTEQGqby4pNe94W2NE7QLArp0sIaU1uhfMlJfXh14U45S9Mq bTndFOvt4/kjGiprOyeN1fYAvGXjQSxpqXGavNFybMfWGEmzeg4rS2kVSsEmFYUCWHaZWeWamaVI 6px1wwpQyLEvkTCmnqdk0OKxvRzdWkWonOw/6HvII5mupkgmk+HYpKfCgkFN2o+HQIzTQaVLvkNW qoAPWomNMp5ZYqEjnDrXEcUJ+8brFGZPIQki6+I4pJroEoSDoHRyOVf9eOlSA/nO98bTFPyU6BiW 8MVcTk/Ml3pgOo87POGo0PVFcH3X2Sz/KHElzxqLyBXMzvZXSjMlF8GrcLZF7dYeq4jKqnLXn8qX porH97yVxzRsC5ilwns0nWN2FAWmyj4e8jM+Ju0ioIQiDxZqtjw9xs+Szy3T8vgf5mWodqKwCLM1 xxR4cjvRGSCgu4zmKyywv1/ZRfvJBQK1c8n0pCy5NyCYPMu8lXd5Dcpj0= From: Pu Xu <583493798@qq.com> To: cuanduo@126.com Cc: dev@dpdk.org, Pu Xu <583493798@qq.com>, olivier.matz@6wind.com, stable@dpdk.org Date: Fri, 1 May 2020 21:50:18 +0800 Message-Id: <20200501135018.130315-1-583493798@qq.com> X-Mailer: git-send-email 2.17.0 Subject: [dpdk-dev] [PATCH] ip_frag: fix fragmenting ipv4 packet with header option 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" 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: a7c528e5d71f ("net: add rte prefix to IP structure") Cc: olivier.matz@6wind.com Cc: stable@dpdk.org Signed-off-by: Pu Xu <583493798@qq.com> --- lib/librte_ip_frag/rte_ipv4_fragmentation.c | 33 +++++++++++++-------- 1 file changed, 20 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..ee0049e09 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,21 @@ 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 +109,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 +131,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 +183,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