fix: avoid loader-lock work in DllMain detach#57
Open
H-Chris233 wants to merge 4 commits into
Open
Conversation
06f74a1 to
7c43c3f
Compare
This file contains hidden or 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
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.
Problem
DllMain'sDLL_PROCESS_DETACHpath calledSteamUI::CoreUnhook()andSteamClient::CoreUnhook(), which may performLoadLibrary/FreeLibraryunder the loader lock. This is unsafe during process termination and can cause deadlocks or undefined behavior.Additionally, nothing prevented an external
FreeLibraryfrom unloading the DLL while hooks and worker threads still reference its code.Changes
Pin the module on
DLL_PROCESS_ATTACHviaGetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_PIN)so the DLL cannot be unmapped while still in use.Guard DETACH work: during process termination (
pvReserved != nullptr), only callFileWatcher::Stop()to avoidstd::thread's joinable-guardstd::terminate. SkipCoreUnhookentirely since it may acquire the loader lock.Testing
std::terminatecrashes).