From: Radu Nicolau Date: Wed, 25 May 2022 13:59:10 +0000 (+0100) Subject: ipsec: fix NAT-T ports and length X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=778bbc089177f2e4cd9b3e66ec1a7940ffcab1e1;p=dpdk.git ipsec: fix NAT-T ports and length Fix the UDP header fields, wrong byte order used for src and dst port and wrong offset used when updating UDP datagram length. Fixes: 01eef5907fc3 ("ipsec: support NAT-T") Cc: stable@dpdk.org Signed-off-by: Radu Nicolau Acked-by: Fan Zhang --- diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c index 6925bb9945..5a5429a12b 100644 --- a/lib/ipsec/esp_outb.c +++ b/lib/ipsec/esp_outb.c @@ -196,7 +196,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, /* if UDP encap is enabled update the dgram_len */ if (sa->type & RTE_IPSEC_SATP_NATT_ENABLE) { struct rte_udp_hdr *udph = (struct rte_udp_hdr *) - (ph - sizeof(struct rte_udp_hdr)); + (ph + sa->hdr_len - sizeof(struct rte_udp_hdr)); udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len); } diff --git a/lib/ipsec/sa.c b/lib/ipsec/sa.c index 1b673b6a18..59a547637d 100644 --- a/lib/ipsec/sa.c +++ b/lib/ipsec/sa.c @@ -364,8 +364,8 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm) struct rte_udp_hdr *udph = (struct rte_udp_hdr *) &sa->hdr[prm->tun.hdr_len]; sa->hdr_len += sizeof(struct rte_udp_hdr); - udph->src_port = prm->ipsec_xform.udp.sport; - udph->dst_port = prm->ipsec_xform.udp.dport; + udph->src_port = rte_cpu_to_be_16(prm->ipsec_xform.udp.sport); + udph->dst_port = rte_cpu_to_be_16(prm->ipsec_xform.udp.dport); udph->dgram_cksum = 0; }