aarch64: Fix AuthenticatedRet when stack bytes are popped#6634
Merged
alexcrichton merged 2 commits intoJun 23, 2023
Merged
Conversation
This commit fixes an accidental issue with bytecodealliance#6478 where when pointer authentication was enabled and stack bytes are being popped during a return this didn't work. In this situation an authenticated return instruction was used, such as `retab`, and no extra stack bytes were popped. The fix here is to use the non-`retab` path which handles stack bytes being popped if there are stack bytes to pop. Closes bytecodealliance#6567
github-actions
Bot
added
cranelift
Member
|
Whoops, thanks for catching this! |
alexcrichton
added a commit
to alexcrichton/wasmtime
that referenced
this pull request
Jun 27, 2023
…alliance#6634) * aarch64: Fix `AuthenticatedRet` when stack bytes are popped This commit fixes an accidental issue with bytecodealliance#6478 where when pointer authentication was enabled and stack bytes are being popped during a return this didn't work. In this situation an authenticated return instruction was used, such as `retab`, and no extra stack bytes were popped. The fix here is to use the non-`retab` path which handles stack bytes being popped if there are stack bytes to pop. Closes bytecodealliance#6567 * Still use `retab` for `is_hint: false`
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
3 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.
This commit fixes an accidental issue with #6478 where when pointer authentication was enabled and stack bytes are being popped during a return this didn't work. In this situation an authenticated return instruction was used, such as
retab, and no extra stack bytes were popped. The fix here is to use the non-retabpath which handles stack bytes being popped if there are stack bytes to pop.Closes #6567