mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-15 06:01:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC RXDP: Reuse allocations between ACK frame processing

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21917)
This commit is contained in:
Hugo Landau 2023-08-31 13:28:34 +01:00
parent a31601cc3f
commit 8c792b0ccd
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ssl/quic/quic_channel.c
View File

@ -524,6 +524,7 @@ static void ch_cleanup(QUIC_CHANNEL *ch)
OPENSSL_free(ch->local_transport_params);
OPENSSL_free((char *)ch->terminate_cause.reason);
OSSL_ERR_STATE_free(ch->err_state);
OPENSSL_free(ch->ack_range_scratch);
/* Free the stateless reset tokens */
for (srte = ossl_list_stateless_reset_tokens_head(&ch->srt_list_seq);

4
ssl/quic/quic_channel_local.h
View File

@ -461,6 +461,10 @@ struct quic_channel_st {
/* Saved error stack in case permanent error was encountered */
ERR_STATE *err_state;
/* Scratch area for use by RXDP to store decoded ACK ranges. */
OSSL_QUIC_ACK_RANGE *ack_range_scratch;
size_t num_ack_range_scratch;
};
# endif

20
ssl/quic/quic_rx_depack.c
View File

@ -64,18 +64,26 @@ static int depack_do_frame_ack(PACKET *pkt, QUIC_CHANNEL *ch,
OSSL_QRX_PKT *qpacket)
{
OSSL_QUIC_FRAME_ACK ack;
OSSL_QUIC_ACK_RANGE *ack_ranges = NULL;
OSSL_QUIC_ACK_RANGE *p;
uint64_t total_ranges = 0;
uint32_t ack_delay_exp = ch->rx_ack_delay_exp;
if (!ossl_quic_wire_peek_frame_ack_num_ranges(pkt, &total_ranges)
/* In case sizeof(uint64_t) > sizeof(size_t) */
|| total_ranges > SIZE_MAX / sizeof(ack_ranges[0])
|| (ack_ranges = OPENSSL_zalloc(sizeof(ack_ranges[0])
* (size_t)total_ranges)) == NULL)
|| total_ranges > SIZE_MAX / sizeof(OSSL_QUIC_ACK_RANGE))
goto malformed;
ack.ack_ranges = ack_ranges;
if (ch->num_ack_range_scratch < (size_t)total_ranges) {
if ((p = OPENSSL_realloc(ch->ack_range_scratch,
sizeof(OSSL_QUIC_ACK_RANGE)
* (size_t)total_ranges)) == NULL)
goto malformed;
ch->ack_range_scratch = p;
ch->num_ack_range_scratch = (size_t)total_ranges;
}
ack.ack_ranges = ch->ack_range_scratch;
ack.num_ack_ranges = (size_t)total_ranges;
if (!ossl_quic_wire_decode_frame_ack(pkt, ack_delay_exp, &ack, NULL))
@ -120,7 +128,6 @@ static int depack_do_frame_ack(PACKET *pkt, QUIC_CHANNEL *ch,
goto malformed;
++ch->diag_num_rx_ack;
OPENSSL_free(ack_ranges);
return 1;
malformed:
@ -128,7 +135,6 @@ malformed:
QUIC_ERR_FRAME_ENCODING_ERROR,
frame_type,
"decode error");
OPENSSL_free(ack_ranges);
return 0;
}