Fix lgpo_reg Registry.pol lock races using EnterCriticalPolicySection#69493
Merged
Conversation
Use EnterCriticalPolicySection/LeaveCriticalPolicySection from userenv.dll to hold the GP critical section across the full read-modify-write cycle in set_value, disable_value, and delete_value. This blocks gpsvc from opening Registry.pol concurrently rather than racing against it. Create _write_with_retry as a fallback for non-GP lockers (AV, VSS) that do not participate in the GP critical section handshake. Apply retry logic to both Registry.pol and gpt.ini writes.
dwoz
approved these changes
Jun 19, 2026
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
2 participants
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.
What does this PR do?
Use EnterCriticalPolicySection/LeaveCriticalPolicySection from userenv.dll to hold the GP critical section across the full read-modify-write cycle in set_value, disable_value, and delete_value. This blocks gpsvc from opening Registry.pol concurrently rather than racing against it.
Create _write_with_retry as a fallback for non-GP lockers (AV, VSS) that do not participate in the GP critical section handshake. Apply retry logic to both Registry.pol and gpt.ini writes.
What issues does this PR fix or reference?
Fixes #69492
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes