d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip_frag: fix fragmenting IPv4 fragment

Browse Source 
Current implementation of rte_ipv4_fragment_packet() doesn’t take
into account offset and flag values of the given packet, but blindly
assumes they are always zero (original packet is not fragmented).
According to RFC791, fragment and flag values for new fragment
should take into account values provided in the original IPv4 packet.

Fixes: 4c38e5532a ("ip_frag: refactor IPv4 fragmentation into a proper library")
Cc: stable@dpdk.org

Signed-off-by: Huichao Cai <chcchc88@163.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
This commit is contained in:
Huichao Cai 2021-10-09 15:27:04 +08:00 committed by Thomas Monjalon
parent 74a74bf98c
commit 567473433b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ip_frag/rte_ipv4_fragmentation.c
View File

@ -75,7 +75,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
uint32_t out_pkt_pos, in_seg_data_pos; uint32_t out_pkt_pos, in_seg_data_pos;
uint32_t more_in_segs; uint32_t more_in_segs;
uint16_t fragment_offset, flag_offset, frag_size, header_len; uint16_t fragment_offset, flag_offset, frag_size, header_len;
uint16_t frag_bytes_remaining; uint16_t frag_bytes_remaining, not_last_frag;
/* /*
* Formal parameter checking. * Formal parameter checking.
@ -116,7 +116,9 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
in_seg = pkt_in; in_seg = pkt_in;
in_seg_data_pos = header_len; in_seg_data_pos = header_len;
out_pkt_pos = 0; out_pkt_pos = 0;
fragment_offset = 0; fragment_offset = (uint16_t)((flag_offset &
RTE_IPV4_HDR_OFFSET_MASK) << RTE_IPV4_HDR_FO_SHIFT);
not_last_frag = (uint16_t)(flag_offset & IPV4_HDR_MF_MASK);
more_in_segs = 1; more_in_segs = 1;
while (likely(more_in_segs)) { while (likely(more_in_segs)) {
@ -186,7 +188,8 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
__fill_ipv4hdr_frag(out_hdr, in_hdr, header_len, __fill_ipv4hdr_frag(out_hdr, in_hdr, header_len,
(uint16_t)out_pkt->pkt_len, (uint16_t)out_pkt->pkt_len,
flag_offset, fragment_offset, more_in_segs); flag_offset, fragment_offset,
not_last_frag || more_in_segs);
fragment_offset = (uint16_t)(fragment_offset + fragment_offset = (uint16_t)(fragment_offset +
out_pkt->pkt_len - header_len); out_pkt->pkt_len - header_len);