mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-05 04:56:10 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: quic: Possible endless loop in qc_treat_rx_pkts()

Browse Source 
Ensure we do not endlessly treat always the same encryption level
in qc_treat_rx_pkts().
This commit is contained in:
Frédéric Lécaille 2021-09-22 15:15:46 +02:00 committed by Amaury Denoyelle
parent 310d1bd08f
commit 3230bcfdc4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xprt_quic.c
View File

@ -2643,7 +2643,9 @@ static inline int qc_treat_rx_crypto_frms(struct quic_enc_level *el,
return 0;
}
/* Process all the packets at <el> encryption level.
/* Process all the packets at <el> and <next_el> encryption level.
* This is the caller responsability to check that <cur_el> is different of <next_el>
* as pointer value.
* Return 1 if succeeded, 0 if not.
*/
int qc_treat_rx_pkts(struct quic_enc_level *cur_el, struct quic_enc_level *next_el,
@ -2706,6 +2708,7 @@ int qc_treat_rx_pkts(struct quic_enc_level *cur_el, struct quic_enc_level *next_
goto err;
if (qel == cur_el) {
BUG_ON(qel == next_el);
qel = next_el;
goto next_tel;
}
@ -2787,9 +2790,11 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state)
skip_send:
/* Check if there is something to do for the next level.
*/
if (next_qel && (next_qel->tls_ctx.rx.flags & QUIC_FL_TLS_SECRETS_SET) &&
if (next_qel && next_qel != qel &&
(next_qel->tls_ctx.rx.flags & QUIC_FL_TLS_SECRETS_SET) &&
(!MT_LIST_ISEMPTY(&next_qel->rx.pqpkts) || !eb_is_empty(&next_qel->rx.pkts))) {
qel = next_qel;
next_qel = NULL;
goto next_level;
}