Bug 5390: Non-POD SquidConfig::ssl_client::sslContext exit crash #273
+10
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Squid may crash when SquidConfig global destruction is initiated by exit() handlers. The problem is that when its non-POD ssl_client::sslContext field is destructed and and SSL_CTX_free() cleanup starts, some of the required SSL environment may be already unavailable. Now we avoid these problems by allocating ssl_client::sslContext dynamically and ensuring that its destructor never starts.
rousskov
requested changes
Nov 18, 2024
rousskov
approved these changes
Nov 20, 2024
src/SquidConfig.h
Outdated
| @@ -505,7 +505,7 @@ class SquidConfig | |||
| struct { | |||
| Security::FuturePeerContext *defaultPeerContext; | |||
| // TODO: Remove when FuturePeerContext above becomes PeerContext | |||
| Security::ContextPointer sslContext; | |||
| Security::ContextPointer *sslContext; | |||
There was a problem hiding this comment.
I noticed that this field only shows up in construction/destruction code diff. Let's confirm and ban its use elsewhere:
Suggested change
| Security::ContextPointer *sslContext; | |
| /// \deprecated Legacy storage. Use defaultPeerContext instead. | |
| Security::ContextPointer *sslContext_; |
... and then adjust the rest of PR code to compile, of course.
src/cache_cf.cc
Outdated
| @@ -968,9 +970,9 @@ configDoConfigure(void) | |||
| #endif | |||
| } | |||
| #if USE_OPENSSL | |||
| Ssl::useSquidUntrusted(Config.ssl_client.sslContext.get()); | |||
| Ssl::useSquidUntrusted(Config.ssl_client.sslContext->get()); | |||
There was a problem hiding this comment.
Technically, this code should be using defaultPeerContext.raw instead, but defaultPeerContext is initialized later. I suggest using the deprecated field here unless others insist on reordering a few lines of code to use defaultPeerContext for this useSquidUntrusted() call:
Suggested change
| Ssl::useSquidUntrusted(Config.ssl_client.sslContext->get()); | |
| Ssl::useSquidUntrusted(Config.ssl_client.sslContext_->get()); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Squid may crash when the SquidConfig global is auto-destructed after
main() ends. Since SquidConfig global is used by cleanup code, we should
keep its fields alive, essentially emulating "No New Globals" policy
effects. This surgical fix will be followed up with more changes to
address general OpenSSL cleanup problems exposed by this bug.
This bug fix facilitates backporting by using FuturePeerContext shim.