Skip to content

Fix memory leaks in SSL subsystem #13026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bryancall wants to merge 3 commits into
base: master
Choose a base branch
from
+14 −2
Open

Fix memory leaks in SSL subsystem #13026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2afa9de
Fix memory leaks in SSLConfig: BIO, session cache,
bryancall Mar 23, 2026
f792099
Fix memory leak in SSLOriginSessionCache destructor
bryancall Mar 23, 2026
2003438
Allocate origin session cache once instead of delete/new on reload Th…
bryancall Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/iocore/net/SSLConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ SSLConfigParams::initialize()
SSLConfigParams::origin_session_cache = ssl_origin_session_cache;
SSLConfigParams::origin_session_cache_size = ssl_origin_session_cache_size;

if (ssl_origin_session_cache == 1 && ssl_origin_session_cache_size > 0) {
if (ssl_origin_session_cache == 1 && ssl_origin_session_cache_size > 0 && origin_sess_cache == nullptr) {
origin_sess_cache = new SSLOriginSessionCache();
}

Expand All @@ -472,6 +472,7 @@ SSLConfigParams::initialize()
set_paths_helper(ssl_ocsp_response_path, nullptr, &ssl_ocsp_response_path_only, nullptr);
}
if (auto rec_str{RecGetRecordStringAlloc("proxy.config.http.request_via_str")}; rec_str) {
ats_free(ssl_ocsp_user_agent);
ssl_ocsp_user_agent = ats_stringdup(rec_str);
}

Expand Down Expand Up @@ -861,6 +862,11 @@ SSLTicketParams::cleanup()
void
cleanup_bio(BIO *&biop)
{
// BIO_new_mem_buf sets BIO_FLAGS_MEM_RDONLY which prevents BIO_free from
// cleaning up internal BUF_MEM structures. Clear this flag so BIO_free
// properly releases them. BIO_NOCLOSE ensures the external data buffer
// (owned by the caller's std::string) is not freed.
BIO_clear_flags(biop, BIO_FLAGS_MEM_RDONLY);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-value"
BIO_set_close(biop, BIO_NOCLOSE);
Expand Down
8 changes: 7 additions & 1 deletion src/iocore/net/SSLSessionCache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ SSLSessDeleter(SSL_SESSION *_p)

SSLOriginSessionCache::SSLOriginSessionCache() {}

SSLOriginSessionCache::~SSLOriginSessionCache() {}
SSLOriginSessionCache::~SSLOriginSessionCache()
{
while (auto *node = orig_sess_que.pop()) {
delete node;
}
orig_sess_map.clear();
}

void
SSLOriginSessionCache::insert_session(const std::string &lookup_key, SSL_SESSION *sess, SSL *ssl)
Expand Down