From 10dfd796c9c25dd78aa88cf84629a0418b8f0866 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 27 Oct 2023 16:11:57 +0100 Subject: [PATCH] If the loss detection timer has fired we may not have lost packets We calculate the delay from the point that a packet arrives until it will be counted as lost based on rtt info. Looking at all the packets we can then calculate the earliest time that a packet will be counted as lost. When that timer fires the latest rtt info may have changed and therefore the packet may no longer be counted as lost yet. We should not assume that just because the ackm timeout has fired that there will definitely be lost packets. Fixes #22538 Reviewed-by: Hugo Landau Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/22541) --- ssl/quic/quic_ackm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssl/quic/quic_ackm.c b/ssl/quic/quic_ackm.c index 728a186d3b0..75a1e5741a0 100644 --- a/ssl/quic/quic_ackm.c +++ b/ssl/quic/quic_ackm.c @@ -1301,8 +1301,8 @@ int ossl_ackm_on_timeout(OSSL_ACKM *ackm) if (!ossl_time_is_zero(earliest_loss_time)) { /* Time threshold loss detection. */ lost_pkts = ackm_detect_and_remove_lost_pkts(ackm, pkt_space); - assert(lost_pkts != NULL); - ackm_on_pkts_lost(ackm, pkt_space, lost_pkts, /*pseudo=*/0); + if (lost_pkts != NULL) + ackm_on_pkts_lost(ackm, pkt_space, lost_pkts, /*pseudo=*/0); ackm_set_loss_detection_timer(ackm); return 1; } -- 2.47.2