[lldb] Fix size of write when querying ptr auth mask #7301
Merged
Conversation
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
According to the MemoryReader documentation, querying the pointer authentication mask should treat the out buffer as pointer-sized in the target process: ``` /// The query should ignore inBuffer, and treat outBuffer as pointer-sized /// buffer (the size of a target pointer, not a swift_addr_t) which should be /// populated with the mask of pointer addressable bits. DLQ_GetPtrAuthMask, ``` LLDB was mistakenly treating the buffer as 8 bytes long. rdar://114237716
|
@swift-ci test |
adrian-prantl
approved these changes
Aug 23, 2023
| @@ -29,7 +29,7 @@ bool LLDBMemoryReader::queryDataLayout(DataLayoutQueryType type, void *inBuffer, | |||
| // disk. Setting the bit in the mask ensures it isn't accidentally cleared | |||
| // by ptrauth stripping. | |||
| mask_pattern |= LLDB_FILE_ADDRESS_BIT; | |||
| memcpy(outBuffer, &mask_pattern, sizeof(uint64_t)); | |||
There was a problem hiding this comment.
Long-term question: Could we change the API vended by the Swift runtime here to at least include a size parameter or is this stable API?
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.
According to the MemoryReader documentation, querying the pointer authentication mask should treat the out buffer as pointer-sized in the target process:
LLDB was mistakenly treating the buffer as 8 bytes long.
rdar://114237716