Fix Unix ARM64 RtlRestoreContext implementation #59831
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
The RtlRestoreContext sets SP before reading out PC from the context. That can lead to a corruption of the PC in the context if an async signal is delivered to the thread or the thread is interrupted by any other mean after the SP is set and before the value of PC is extracted from the context. This change fixes it by setting the SP after both PC and SP values are read from the context data structure.
jkotas
reviewed
Sep 30, 2021
| ldr x17, [x16, CONTEXT_Sp] | ||
| mov sp, x17 | ||
| ldr x17, [x16, CONTEXT_Pc] | ||
| ldp x16, x17, [x16, CONTEXT_Sp] // Context_Pc is right after Context_Sp |
jkotas
approved these changes
Sep 30, 2021
Member
jkotas
left a comment
jkotas
left a comment
There was a problem hiding this comment.
Thank you! I think we should consider this for backport to .NET 6.
Member
|
/backport to release/6.0 |
Contributor
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1293350876 |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The RtlRestoreContext sets SP before reading out PC from the
context. That can lead to a corruption of the PC in the context
if an async signal is delivered to the thread or the thread is
interrupted by any other mean after the SP is set and before
the value of PC is extracted from the context.
This change fixes it by setting the SP after both PC and SP values
are read from the context data structure.