diff options
| author |   Christian Hopps <chopps@labn.net> | 2020-08-25 12:40:40 -0400 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2020-09-04 11:56:06 +0000 |
| commit | d570e53c74306d3aa237acbd56357a85b9d693a3 (patch) | |
| tree | 365122d4f84ab913006b40a88ba9a1e141ba2ee8 | |
| parent | 99975388a2106e65965a7661ac21a34af288aa7b (diff) | |
ipsec: fix trace of GRE_teb packets
The issue is not easily hit. When GRE_teb packets are received the post
crypto processing adjusts the l2.l2_len value in the vnet_buffer opaque
data. This is overwriting the ipsec opaque data. Later the trace code
fetches the sa_index from the ipsec opaque data. It's just an accident
that this currently works, if the ipsec data is changed so that the
sa_index moves around it will be overwritten by the l2_len modification.
Indeed, this was found b/c local development changes had moved the
sa_index so it was over-lapping with the l2_len memory space, and the UT
failed.
Type: fix
Change-Id: Iaecfa750cf0b36653fd9e75b4d799f323a14d932
Signed-off-by: Christian Hopps <chopps@labn.net>
| -rw-r--r-- | src/vnet/ipsec/esp_decrypt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/vnet/ipsec/esp_decrypt.c b/src/vnet/ipsec/esp_decrypt.c index b3c031e54af..75092cc9581 100644 --- a/src/vnet/ipsec/esp_decrypt.c +++ b/src/vnet/ipsec/esp_decrypt.c @@ -1265,6 +1265,10 @@ esp_decrypt_inline (vlib_main_t * vm, CLIB_CACHE_LINE_BYTES * 2, LOAD); } + /* save the sa_index as GRE_teb post_crypto changes L2 opaque */ + if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED)) + current_sa_index = vnet_buffer (b[0])->ipsec.sad_index; + if (next[0] >= ESP_DECRYPT_N_NEXT) esp_decrypt_post_crypto (vm, node, pd, pd2, b[0], next, is_ip6, is_tun, 0); @@ -1274,8 +1278,7 @@ esp_decrypt_inline (vlib_main_t * vm, { esp_decrypt_trace_t *tr; tr = vlib_add_trace (vm, node, b[0], sizeof (*tr)); - sa0 = pool_elt_at_index (im->sad, - vnet_buffer (b[0])->ipsec.sad_index); + sa0 = pool_elt_at_index (im->sad, current_sa_index); tr->crypto_alg = sa0->crypto_alg; tr->integ_alg = sa0->integ_alg; tr->seq = pd->seq; |