Add guarded kernel stacks and harden RISC-V trap entry against stack overflow#25
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
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.
Summary
TrapFrame.Trap Entry Changes
U-mode trap entry now reserves a small, known-mapped scratch area at the top of the kernel stack.
The entry sequence:
t0and the user stack pointer in the scratch area.sscratchbefore validating the prospective trap-frame address.kernel_sp - size_of::<TrapFrame>()against the guarded stack slot.Clearing
sscratchbefore the boundary check ensures that a nested synchronous fault follows the S-mode entry path instead of interpreting the user stack pointer as a kernel stack pointer.Smoke Tests
S-mode Kernel Stack Overflow
Feature:
This test moves the active kernel stack pointer below the mapped stack boundary and performs a store. It verifies that:
StorePagefault occurs in the guard page.U-mode Trap-frame Overflow
Feature:
This test places the U-mode trap scratch anchor at the lower mapped stack boundary and enters user mode. The first system call verifies that:
TrapFrameis rejected before its first store.EnvironmentCallFromUModecause is preserved.The two destructive tests run in separate QEMU instances in CI.
Validation
cargo clippypasses with warnings denied for both smoke-test feature configurations.PageFault(StorePage(...)).EnvironmentCallFromUMode.git diff --checkpasses.