Skip to content

enable CET IBT in TDX supervisor #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2024
Merged

enable CET IBT in TDX supervisor #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9caaea7
simplify or'ing together multiple values
Freax13 Oct 19, 2024
87f52d6
enable CET IBT in TDX supervisor
Freax13 Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions tee/supervisor-snp/src/reset_vector.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,7 @@ mov rax, cr0
or rax, 1 << 1
mov cr0, rax
mov rax, cr4
or rax, 1 << 9
or rax, 1 << 10
or rax, 1 << 18
or rax, (1 << 9) | (1 << 10) | (1 << 18)
mov cr4, rax
# 7.2 Enable AVX
xor rcx, rcx
Expand Down
2 changes: 1 addition & 1 deletion tee/supervisor-tdx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CARGO_BUILD_STD_FEATURES = $(CARGO_BUILD_STD_FEATURES_$(PROFILE))
CARGO_EXTRA_FLAGS_release = --features harden
CARGO_EXTRA_FLAGS = $(CARGO_EXTRA_FLAGS_$(PROFILE))

export RUSTFLAGS = -Z cf-protection=return
export RUSTFLAGS = -Z cf-protection=full

supervisor:
cargo build \
Expand Down
8 changes: 3 additions & 5 deletions tee/supervisor-tdx/src/reset_vector.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ mov rax, cr0
or rax, 1 << 1
mov cr0, rax
mov rax, cr4
or rax, 1 << 9
or rax, 1 << 10
or rax, 1 << 18
or rax, (1 << 9) | (1 << 10) | (1 << 18)
mov cr4, rax
# 5.2 Enable AVX
xor rcx, rcx
Expand Down Expand Up @@ -98,10 +96,10 @@ add r8, SHADOW_STACK_SIZE - 8
mov rax, cr4
or rax, 1 << 23
mov cr4, rax
# 7.2 Enable Shadow Stacks in in SCET MSR
# 7.2 Enable SH_STK_EN, ENBR_EN, and NO_TRACK_EN in in SCET MSR
mov ecx, 0x6a2
xor edx, edx
mov eax, 1
mov eax, (1 << 0) | (1 << 2) | (1 << 4)
wrmsr
# 7.3 Load SSP
rstorssp [r8]
Expand Down