From cae02d2b0a650f07d29c9072a159b70035ae6c07 Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Tue, 18 Jul 2023 16:14:54 +0100 Subject: [PATCH] QUIC APL: Ensure tick inhibition is not used during blocking Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/21484) --- ssl/quic/quic_impl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index 2775a4b938..a725bd7310 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -55,6 +55,12 @@ static int block_until_pred(QUIC_CONNECTION *qc, assert(qc->ch != NULL); + /* + * Any attempt to block auto-disables tick inhibition as otherwise we will + * hang around forever. + */ + ossl_quic_channel_set_inhibit_tick(qc->ch, 0); + rtor = ossl_quic_channel_get_reactor(qc->ch); return ossl_quic_reactor_block_until_pred(rtor, pred, pred_arg, flags, qc->mutex); -- 2.39.5