denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

esp-packet: Fix leak and avoid one if AEAD implementations misbehave

Browse Source 
If an `aead_t` implementation incorrectly allocates memory if the
decryption/ICV verification failed, this avoids a leak.  Unfortunately,
many implementations actually did that.

Fixes: 24a8d1253f ("libipsec: Wrap traditional algorithms in AEAD wrapper")
This commit is contained in:
Tobias Brunner
2026-07-22 18:20:12 +02:00
parent f5aeba0f02
commit dae65dd492
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libipsec/esp_packet.c
+3 -1
View File
@@ -229,7 +229,7 @@ METHOD(esp_packet_t, decrypt, status_t,
{ {
bio_reader_t *reader; bio_reader_t *reader;
uint32_t spi, seq; uint32_t spi, seq;
chunk_t data, iv, icv, aad, ciphertext, plaintext; chunk_t data, iv, icv, aad, ciphertext, plaintext = chunk_empty;
aead_t *aead; aead_t *aead;
DESTROY_IF(this->payload); DESTROY_IF(this->payload);
@@ -246,6 +246,7 @@ METHOD(esp_packet_t, decrypt, status_t,
reader->remaining(reader) % aead->get_block_size(aead)) reader->remaining(reader) % aead->get_block_size(aead))
{ {
DBG1(DBG_ESP, "ESP decryption failed: invalid length"); DBG1(DBG_ESP, "ESP decryption failed: invalid length");
reader->destroy(reader);
return PARSE_ERROR; return PARSE_ERROR;
} }
ciphertext = reader->peek(reader); ciphertext = reader->peek(reader);
@@ -269,6 +270,7 @@ METHOD(esp_packet_t, decrypt, status_t,
if (!aead->decrypt(aead, ciphertext, aad, iv, &plaintext)) if (!aead->decrypt(aead, ciphertext, aad, iv, &plaintext))
{ {
DBG1(DBG_ESP, "ESP decryption or ICV verification failed"); DBG1(DBG_ESP, "ESP decryption or ICV verification failed");
chunk_free(&plaintext);
return FAILED; return FAILED;
} }
esp_context->set_authenticated_seqno(esp_context, seq); esp_context->set_authenticated_seqno(esp_context, seq);