Fix wrong DACL memory size on Windows (createWindowsDACL) #10712
+2
−1
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
phoerious
approved these changes
May 8, 2024
Each AddAccessAllowedAce invocation should be matched with a corresponding sizeof(ACCESS_ALLOWED_ACE) and the respective GetLengthSid of the SID being used. This ensures that there is enough space in the ACL for each entry. The issue manifest itself only when WITH_XC_SSHAGENT is defined.
pull bot
pushed a commit
to shashinma/keepassxc
that referenced
this pull request
May 21, 2024
…boot#10712) Each AddAccessAllowedAce invocation should be matched with a corresponding sizeof(ACCESS_ALLOWED_ACE) and the respective GetLengthSid of the SID being used. This ensures that there is enough space in the ACL for each entry. The issue manifest itself only when WITH_XC_SSHAGENT is defined.
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.
The function
createWindowsDACLincorrectly calculates the memory allocation size for the DACL.Each
AddAccessAllowedAcecall should correspond to asizeof(ACCESS_ALLOWED_ACE)plus theGetLengthSidof the SID being used, ensuring sufficient space in the ACL for each entry. However, the original code mistakenly includes only two instances ofsizeof(ACCESS_ALLOWED_ACE)in the size calculation, although there are three instances ofGetLengthSidin the sum and there are up to threeAddAccessAllowedAcecalls when theWITH_XC_SSHAGENTcompilation flag is defined.This change corrects the DACL memory allocation calculation to accurately account for all potential
AddAccessAllowedAcecalls by conditionally including the thirdsizeof(ACCESS_ALLOWED_ACE). This ensures correct memory allocation across all configurations.Fixes #10713
Testing strategy
manual test.
Type of change