mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-10-26 14:10:59 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: ssl: Free global_ssl structure contents during deinit

Browse Source 
Some fields of the global_ssl structure are strings that are strdup'ed
but never freed. There is only one static global_ssl structure so not
much memory is used but we might as well free it during deinit.

This patch can be backported to all stable branches.
This commit is contained in:
Remi Tricot-Le Breton 2025-10-10 17:05:21 +02:00 committed by William Lallemand
parent 54b7539d64
commit 9bc6a0349d
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/ssl_sock.c
View File

@ -7962,6 +7962,41 @@ static void ssl_sock_clt_sni_free_func(void *parent, void *ptr, CRYPTO_EX_DATA *
pool_free(ssl_sock_client_sni_pool, ptr);
}
static void ssl_free_global(void)
{
ha_free(&global_ssl.crt_base);
ha_free(&global_ssl.ca_base);
ha_free(&global_ssl.issuers_chain_path);
if (global_ssl.listen_default_ciphers != LISTEN_DEFAULT_CIPHERS)
ha_free(&global_ssl.listen_default_ciphers);
if (global_ssl.connect_default_ciphers != CONNECT_DEFAULT_CIPHERS)
ha_free(&global_ssl.connect_default_ciphers);
#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
if (global_ssl.listen_default_ciphersuites != LISTEN_DEFAULT_CIPHERSUITES)
ha_free(&global_ssl.listen_default_ciphersuites);
if (global_ssl.connect_default_ciphersuites != CONNECT_DEFAULT_CIPHERSUITES)
ha_free(&global_ssl.connect_default_ciphersuites);
#endif
#if defined(SSL_CTX_set1_curves_list)
ha_free(&global_ssl.listen_default_curves);
ha_free(&global_ssl.connect_default_curves);
#endif
#if defined(SSL_CTX_set1_sigalgs_list)
ha_free(&global_ssl.listen_default_sigalgs);
ha_free(&global_ssl.connect_default_sigalgs);
ha_free(&global_ssl.listen_default_client_sigalgs);
ha_free(&global_ssl.connect_default_client_sigalgs);
#endif
}
static void __ssl_sock_init(void)
{
#if (!defined(OPENSSL_NO_COMP) && !defined(SSL_OP_NO_COMPRESSION))
@ -8068,6 +8103,8 @@ static void __ssl_sock_init(void)
* ssl_sock_register_msg_callback().
*/
hap_register_post_deinit(ssl_sock_unregister_msg_callbacks);
hap_register_post_deinit(ssl_free_global);
}
INITCALL0(STG_REGISTER, __ssl_sock_init);