Restructure GDT. Add sysenter support #290
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
wipawel
added
feature
minipli-oss
reviewed
Aug 28, 2023
minipli-oss
reviewed
Aug 28, 2023
minipli-oss
reviewed
Aug 28, 2023
minipli-oss
reviewed
Aug 28, 2023
minipli-oss
reviewed
Aug 28, 2023
minipli-oss
reviewed
Aug 28, 2023
minipli-oss
requested changes
Aug 28, 2023
Contributor
minipli-oss
left a comment
minipli-oss
left a comment
There was a problem hiding this comment.
Thanks a lot for doing this cleanup! The comments in segment.h are especially helpful, I think!
Can you please rebase your branch, as some of the depending commits got merged?
sktt
force-pushed
the
sysenter
branch
4 times, most recently
from
ca0212e to
9dbf6c3
Compare
wipawel
requested changes
Aug 28, 2023
minipli-oss
requested changes
Aug 28, 2023
sktt
force-pushed
the
sysenter
branch
7 times, most recently
from
b60cec7 to
9f8e9c2
Compare
wipawel
requested changes
Aug 29, 2023
sktt
force-pushed
the
sysenter
branch
2 times, most recently
from
9bb61f9 to
2305a69
Compare
This allows us to use syscall from inline asm without clobbering all callee-clobbered registers. Saving/restoring all registers also prevents "leaking" kernel register values into userland. Signed-off-by: Johannes Wikner <johannes.wikner@gmail.com>
The GDT entries needed to be re-organized to support sysexit. While
doing so, better document why they exist in the first place, and their
particular order.
Rename __KERN_{CS,DS}16 -> __RMODE_{CS,DS}16 to clearly indicate that
these entries only exist in the real mode GDT.
Omit entries that are unused in i386 or unused for a particular gdt.
Signed-off-by: Johannes Wikner <johannes.wikner@gmail.com>
user_cs should point to USER_CS32 so that correct %cs and %ss are set upon sysret and sysretq. This fixes a subtle bug which where branches using %cs (e.g., intra-mode iret) would crash after a syscall. Signed-off-by: Johannes Wikner <johannes.wikner@gmail.com>
Introduces the necessary MSRs, and sets them to handle sysenter and sysexits. Add macro to choose approriate instruction depending on build. When adding compatibility mode support, we need to use either sysexit or sysexitq depending on what usermode is executing. Same for sysret and sysretq. Signed-off-by: Johannes Wikner <johannes.wikner@gmail.com>
To give usermode the option to choose sysenter instead of syscall, we expose syscall_mode(enum syscall_mode), which is by default using syscall. Signed-off-by: Johannes Wikner <johannes.wikner@gmail.com>
From usermode's perspective it works the same as syscall. Signed-off-by: Johannes Wikner <johannes.wikner@gmail.com> Signed-off-by: Pawel Wieczorkiewicz <wipawel@grsecurity.net>
wipawel
approved these changes
Aug 30, 2023
minipli-oss
approved these changes
Aug 30, 2023
Contributor
minipli-oss
left a comment
minipli-oss
left a comment
There was a problem hiding this comment.
Thanks a lot, Johannes!
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.
Based on #284. Request for comments on this.
In particular the GDT bit that had to be reworked a bit. Also, whether and how we should give the option to use sysenter instead of syscall.