New upstream version 16.11.9

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

diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/librte_ip_frag/rte_ipv4_reassembly.c
index 26d07f9..ede2ae0 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv4_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv4_reassembly.c
@@ -41,11 +41,12 @@
  * Reassemble fragments into one packet.
  */
 struct rte_mbuf *
-ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
+ipv4_frag_reassemble(struct ip_frag_pkt *fp)
 {
        struct ipv4_hdr *ip_hdr;
        struct rte_mbuf *m, *prev;
        uint32_t i, n, ofs, first_len;
+       uint32_t curr_idx = 0;
 
        first_len = fp->frags[IP_FIRST_FRAG_IDX].len;
        n = fp->last_idx - 1;
@@ -53,6 +54,7 @@ ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
        /*start from the last fragment. */
        m = fp->frags[IP_LAST_FRAG_IDX].mb;
        ofs = fp->frags[IP_LAST_FRAG_IDX].ofs;
+       curr_idx = IP_LAST_FRAG_IDX;
 
        while (ofs != first_len) {
 
@@ -63,10 +65,17 @@ ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
                        /* previous fragment found. */
                        if(fp->frags[i].ofs + fp->frags[i].len == ofs) {
 
+                               RTE_ASSERT(curr_idx != i);
+
                                /* adjust start of the last fragment data. */
-                               rte_pktmbuf_adj(m, (uint16_t)(m->l2_len + m->l3_len));
+                               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;
@@ -82,7 +91,9 @@ ipv4_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;
@@ -117,14 +128,14 @@ ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
  */
 struct rte_mbuf *
 rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,
-               struct rte_ip_frag_death_row *dr, struct rte_mbuf *mb, uint64_t tms,
-               struct ipv4_hdr *ip_hdr)
+       struct rte_ip_frag_death_row *dr, struct rte_mbuf *mb, uint64_t tms,
+       struct ipv4_hdr *ip_hdr)
 {
        struct ip_frag_pkt *fp;
        struct ip_frag_key key;
        const unaligned_uint64_t *psd;
-       uint16_t ip_len;
        uint16_t flag_offset, ip_ofs, ip_flag;
+       int32_t ip_len;
 
        flag_offset = rte_be_to_cpu_16(ip_hdr->fragment_offset);
        ip_ofs = (uint16_t)(flag_offset & IPV4_HDR_OFFSET_MASK);
@@ -137,12 +148,11 @@ rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,
        key.key_len = IPV4_KEYLEN;
 
        ip_ofs *= IPV4_HDR_OFFSET_UNITS;
-       ip_len = (uint16_t)(rte_be_to_cpu_16(ip_hdr->total_length) -
-               mb->l3_len);
+       ip_len = rte_be_to_cpu_16(ip_hdr->total_length) - mb->l3_len;
 
        IP_FRAG_LOG(DEBUG, "%s:%d:\n"
                "mbuf: %p, tms: %" PRIu64
-               ", key: <%" PRIx64 ", %#x>, ofs: %u, len: %u, flags: %#x\n"
+               ", key: <%" PRIx64 ", %#x>, ofs: %u, len: %d, flags: %#x\n"
                "tbl: %p, max_cycles: %" PRIu64 ", entry_mask: %#x, "
                "max_entries: %u, use_entries: %u\n\n",
                __func__, __LINE__,
@@ -150,6 +160,12 @@ rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,
                tbl, tbl->max_cycles, tbl->entry_mask, tbl->max_entries,
                tbl->use_entries);
 
+       /* check that fragment length is greater then zero. */
+       if (ip_len <= 0) {
+               IP_FRAG_MBUF2DR(dr, mb);
+               return NULL;
+       }
+
        /* try to find/add entry into the fragment's table. */
        if ((fp = ip_frag_find(tbl, dr, &key, tms)) == NULL) {
                IP_FRAG_MBUF2DR(dr, mb);