4f512a1919
The first mbuf and the last mbuf to be visited in the preceding loop
are not set to NULL in the fragmentation table. This creates the
possibility of a double free when the fragmentation table is later freed
with rte_ip_frag_table_destroy().
Fixes: 95908f5239
("ip_frag: free mbufs on reassembly table destroy")
Cc: stable@dpdk.org
Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
164 lines
4.5 KiB
C
164 lines
4.5 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright(c) 2010-2014 Intel Corporation
|
|
*/
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <rte_debug.h>
|
|
|
|
#include "ip_frag_common.h"
|
|
|
|
/*
|
|
* Reassemble fragments into one packet.
|
|
*/
|
|
struct rte_mbuf *
|
|
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;
|
|
|
|
/*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) {
|
|
|
|
prev = m;
|
|
|
|
for (i = n; i != IP_FIRST_FRAG_IDX && ofs != first_len; i--) {
|
|
|
|
/* previous fragment found. */
|
|
if(fp->frags[i].ofs + fp->frags[i].len == ofs) {
|
|
|
|
/* adjust start of the last fragment data. */
|
|
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;
|
|
}
|
|
}
|
|
|
|
/* error - hole in the packet. */
|
|
if (m == prev) {
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* 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;
|
|
|
|
/* update ipv4 header for the reassembled packet */
|
|
ip_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, m->l2_len);
|
|
|
|
ip_hdr->total_length = rte_cpu_to_be_16((uint16_t)(fp->total_size +
|
|
m->l3_len));
|
|
ip_hdr->fragment_offset = (uint16_t)(ip_hdr->fragment_offset &
|
|
rte_cpu_to_be_16(IPV4_HDR_DF_FLAG));
|
|
ip_hdr->hdr_checksum = 0;
|
|
|
|
return m;
|
|
}
|
|
|
|
/*
|
|
* Process new mbuf with fragment of IPV4 packet.
|
|
* Incoming mbuf should have it's l2_len/l3_len fields setuped correclty.
|
|
* @param tbl
|
|
* Table where to lookup/add the fragmented packet.
|
|
* @param mb
|
|
* Incoming mbuf with IPV4 fragment.
|
|
* @param tms
|
|
* Fragment arrival timestamp.
|
|
* @param ip_hdr
|
|
* Pointer to the IPV4 header inside the fragment.
|
|
* @return
|
|
* Pointer to mbuf for reassembled packet, or NULL if:
|
|
* - an error occurred.
|
|
* - not all fragments of the packet are collected yet.
|
|
*/
|
|
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 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;
|
|
|
|
flag_offset = rte_be_to_cpu_16(ip_hdr->fragment_offset);
|
|
ip_ofs = (uint16_t)(flag_offset & IPV4_HDR_OFFSET_MASK);
|
|
ip_flag = (uint16_t)(flag_offset & IPV4_HDR_MF_FLAG);
|
|
|
|
psd = (unaligned_uint64_t *)&ip_hdr->src_addr;
|
|
/* use first 8 bytes only */
|
|
key.src_dst[0] = psd[0];
|
|
key.id = ip_hdr->packet_id;
|
|
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_FRAG_LOG(DEBUG, "%s:%d:\n"
|
|
"mbuf: %p, tms: %" PRIu64
|
|
", key: <%" PRIx64 ", %#x>, ofs: %u, len: %u, flags: %#x\n"
|
|
"tbl: %p, max_cycles: %" PRIu64 ", entry_mask: %#x, "
|
|
"max_entries: %u, use_entries: %u\n\n",
|
|
__func__, __LINE__,
|
|
mb, tms, key.src_dst[0], key.id, ip_ofs, ip_len, ip_flag,
|
|
tbl, tbl->max_cycles, tbl->entry_mask, tbl->max_entries,
|
|
tbl->use_entries);
|
|
|
|
/* 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);
|
|
return NULL;
|
|
}
|
|
|
|
IP_FRAG_LOG(DEBUG, "%s:%d:\n"
|
|
"tbl: %p, max_entries: %u, use_entries: %u\n"
|
|
"ipv4_frag_pkt: %p, key: <%" PRIx64 ", %#x>, start: %" PRIu64
|
|
", total_size: %u, frag_size: %u, last_idx: %u\n\n",
|
|
__func__, __LINE__,
|
|
tbl, tbl->max_entries, tbl->use_entries,
|
|
fp, fp->key.src_dst[0], fp->key.id, fp->start,
|
|
fp->total_size, fp->frag_size, fp->last_idx);
|
|
|
|
|
|
/* process the fragmented packet. */
|
|
mb = ip_frag_process(fp, dr, mb, ip_ofs, ip_len, ip_flag);
|
|
ip_frag_inuse(tbl, fp);
|
|
|
|
IP_FRAG_LOG(DEBUG, "%s:%d:\n"
|
|
"mbuf: %p\n"
|
|
"tbl: %p, max_entries: %u, use_entries: %u\n"
|
|
"ipv4_frag_pkt: %p, key: <%" PRIx64 ", %#x>, start: %" PRIu64
|
|
", total_size: %u, frag_size: %u, last_idx: %u\n\n",
|
|
__func__, __LINE__, mb,
|
|
tbl, tbl->max_entries, tbl->use_entries,
|
|
fp, fp->key.src_dst[0], fp->key.id, fp->start,
|
|
fp->total_size, fp->frag_size, fp->last_idx);
|
|
|
|
return mb;
|
|
}
|