New upstream version 18.05

[deb_dpdk.git] / lib / librte_ip_frag / rte_ipv6_reassembly.c

diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/librte_ip_frag/rte_ipv6_reassembly.c
index d29cb1d..db249fe 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv6_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv6_reassembly.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stddef.h>
@@ -59,13 +30,14 @@ ip_frag_memmove(char *dst, char *src, int len)
  * Reassemble fragments into one packet.
  */
 struct rte_mbuf *
-ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
+ipv6_frag_reassemble(struct ip_frag_pkt *fp)
 {
        struct ipv6_hdr *ip_hdr;
        struct ipv6_extension_fragment *frag_hdr;
        struct rte_mbuf *m, *prev;
        uint32_t i, n, ofs, first_len;
        uint32_t last_len, move_len, payload_len;
+       uint32_t curr_idx = 0;
 
        first_len = fp->frags[IP_FIRST_FRAG_IDX].len;
        n = fp->last_idx - 1;
@@ -74,6 +46,7 @@ ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
        m = fp->frags[IP_LAST_FRAG_IDX].mb;
        ofs = fp->frags[IP_LAST_FRAG_IDX].ofs;
        last_len = fp->frags[IP_LAST_FRAG_IDX].len;
+       curr_idx = IP_LAST_FRAG_IDX;
 
        payload_len = ofs + last_len;
 
@@ -90,6 +63,10 @@ ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
                                rte_pktmbuf_adj(m, (uint16_t)(m->l2_len + m->l3_len));
                                rte_pktmbuf_chain(fp->frags[i].mb, m);
 
+                               /* this mbuf should not be accessed directly */
+                               fp->frags[curr_idx].mb = NULL;
+                               curr_idx = i;
+
                                /* update our last fragment and offset. */
                                m = fp->frags[i].mb;
                                ofs = fp->frags[i].ofs;
@@ -105,7 +82,9 @@ ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
        /* chain with the first fragment. */
        rte_pktmbuf_adj(m, (uint16_t)(m->l2_len + m->l3_len));
        rte_pktmbuf_chain(fp->frags[IP_FIRST_FRAG_IDX].mb, m);
+       fp->frags[curr_idx].mb = NULL;
        m = fp->frags[IP_FIRST_FRAG_IDX].mb;
+       fp->frags[IP_FIRST_FRAG_IDX].mb = NULL;
 
        /* update mbuf fields for reassembled packet. */
        m->ol_flags |= PKT_TX_IP_CKSUM;
@@ -149,7 +128,7 @@ ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
  *   Pointer to the IPV6 fragment extension header.
  * @return
  *   Pointer to mbuf for reassembled packet, or NULL if:
- *   - an error occured.
+ *   - an error occurred.
  *   - not all fragments of the packet are collected yet.
  */
 #define MORE_FRAGS(x) (((x) & 0x100) >> 8)