From: Hugo Landau <hlandau@openssl.org>
Date: Tue, 18 Jul 2023 15:14:54 +0000 (+0100)
Subject: QUIC APL: Ensure tick inhibition is not used during blocking
X-Git-Tag: openssl-3.2.0-alpha1~348
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cae02d2b0a650f07d29c9072a159b70035ae6c07;p=thirdparty%2Fopenssl.git

QUIC APL: Ensure tick inhibition is not used during blocking

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21484)
---

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);