From: Joshua Rogers <MegaManSec@users.noreply.github.com>
Date: Sat, 11 Oct 2025 00:09:43 +0000 (+0800)
Subject: quic: avoid partial update in ossl_quic_bind_channel
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4aa7b26df006cdcb469dfbf811c00698d803cdf6;p=thirdparty%2Fopenssl.git

quic: avoid partial update in ossl_quic_bind_channel

Signed-off-by: Joshua Rogers <MegaManSec@users.noreply.github.com>

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28848)
---

diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index 7679ec8790e..c7c60d97e9b 100644
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -3815,10 +3815,11 @@ int ossl_quic_bind_channel(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
     if (!ossl_assert(ch->state == QUIC_CHANNEL_STATE_IDLE && ch->is_server))
         return 0;
 
-    ch->cur_local_cid = *peer_dcid;
     if (!ossl_quic_lcidm_bind_channel(ch->lcidm, ch, peer_dcid))
         return 0;
 
+    ch->cur_local_cid = *peer_dcid;
+
     /*
      * peer_odcid <=> is initial dst conn id chosen by peer in its
      * first initial packet we received without token.