[NativeAOT] Adjust SSP to match RSP of the throw site #119167
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
This fixes unbounded shadow stack growth that leads to stack overflow exception when exceptions are thrown and caught in a loop. Fixes dotnet#118913 Fixes dotnet#107418
There was a problem hiding this comment.
Pull Request Overview
This PR fixes unbounded shadow stack growth in NativeAOT that was causing stack overflow exceptions when exceptions are thrown and caught in loops. The fix adjusts the Shadow Stack Pointer (SSP) to properly match the Regular Stack Pointer (RSP) at the throw site, preventing stack accumulation during exception handling.
- Adds SSP adjustment logic to align with RSP at throw sites
- Removes exclusion of previously failing test case that is now fixed
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/tests/issues.targets | Removes test exclusion for NativeAOT ControlFlowGuard issue that is now resolved |
| src/coreclr/nativeaot/Runtime/amd64/ExceptionHandling.asm | Adds SSP adjustment logic in RhpThrowEx and RhpRethrow functions to prevent unbounded shadow stack growth |
|
Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas |
|
/azp run runtime-nativeaot-outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/backport to release/10.0 |
|
Started backporting to release/10.0: https://github.com/dotnet/runtime/actions/runs/17307854868 |
4 tasks
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.
This fixes unbounded shadow stack growth that leads to stack overflow exception when exceptions are thrown and caught in a loop.
Fixes #118913
Fixes #107418