diff options
| author | Xiao Liang <[email protected]> | 2023-07-11 10:18:47 +0800 |
|---|---|---|
| committer | Akhil Goyal <[email protected]> | 2023-07-11 10:47:00 +0200 |
| commit | 5d89d22e9e49771059ecc6383aa4313394fc72f7 (patch) | |
| tree | 6b912e6293b2ab5ecb97dc73b9198cd0ac2e77e4 /lib/ipsec | |
| parent | 7bd42fa018e2dc84cc591bdc1dc32729b4c68ef4 (diff) | |
ipsec: fix NAT-T header length
UDP header and L2 header (if any) length is included in sa->hdr_len.
Take care of that in L3 header and packet length calculation.
Fixes: 01eef5907fc3 ("ipsec: support NAT-T")
Cc: [email protected]
Signed-off-by: Xiao Liang <[email protected]>
Acked-by: Konstantin Ananyev <[email protected]>
Acked-by: Radu Nicolau <[email protected]>
Diffstat (limited to 'lib/ipsec')
| -rw-r--r-- | lib/ipsec/esp_outb.c | 2 | ||||
| -rw-r--r-- | lib/ipsec/sa.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c index 9cbd9202f6..ec87b1dce2 100644 --- a/lib/ipsec/esp_outb.c +++ b/lib/ipsec/esp_outb.c @@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, struct rte_udp_hdr *udph = (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); + sa->hdr_len + sizeof(struct rte_udp_hdr)); } /* update original and new ip header fields */ diff --git a/lib/ipsec/sa.c b/lib/ipsec/sa.c index 59a547637d..2297bd6d72 100644 --- a/lib/ipsec/sa.c +++ b/lib/ipsec/sa.c @@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm) /* update l2_len and l3_len fields for outbound mbuf */ sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off, - sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0); + prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0); esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value); } |