diff options
| author | Matt Caswell <matt@openssl.org> | 2024-01-18 12:25:47 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2024-01-31 10:10:55 +0000 |
| commit | f7f2b665cf91650deb28beb1145ea3eca7df67aa (patch) | |
| tree | a719851904c7176f7f2974c4b0ea95a3da3abacb /ssl | |
| parent | fa4b1151c829b8be1d83cb49c9809d3a4f59fb03 (diff) | |
Free the QUIC TLS object before freeing the channel
Freeing the QUIC TLS object may make calls back into QUIC so we should
free it first.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23256)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/quic/quic_impl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index fecd9525be..c7f35aba29 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -544,6 +544,8 @@ void ossl_quic_free(SSL *s) } #endif + SSL_free(ctx.qc->tls); + ossl_quic_channel_free(ctx.qc->ch); ossl_quic_port_free(ctx.qc->port); ossl_quic_engine_free(ctx.qc->engine); @@ -551,13 +553,15 @@ void ossl_quic_free(SSL *s) BIO_free_all(ctx.qc->net_rbio); BIO_free_all(ctx.qc->net_wbio); - /* Note: SSL_free calls OPENSSL_free(qc) for us */ - - SSL_free(ctx.qc->tls); quic_unlock(ctx.qc); /* tsan doesn't like freeing locked mutexes */ #if defined(OPENSSL_THREADS) ossl_crypto_mutex_free(&ctx.qc->mutex); #endif + + /* + * Note: SSL_free (that called this function) calls OPENSSL_free(ctx.qc) for + * us + */ } /* SSL method init */ |