Skip to content
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

[NativeAOT] Adding CET support #102680

Merged
merged 18 commits into from
Jul 2, 2024
Merged

[NativeAOT] Adding CET support #102680

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ecb5c6c
Add support for STATUS_RETURN_ADDRESS_HIJACK_ATTEMPT
VSadov May 25, 2024
a56e166
fix build with clang
VSadov May 25, 2024
0f0c3b6
Allow hijacked returns that land in assembly thunks
VSadov May 25, 2024
e69f551
fix x86 build
VSadov May 25, 2024
c518684
fail fast if hijack is hit on an unhijacked thread.
VSadov May 25, 2024
0ab6e40
comment
VSadov May 28, 2024
f0193bf
assert that OS unhijacked the thread to the same target as stashed by…
VSadov May 28, 2024
bd1ac22
opt into CETCOMPAT by default
VSadov May 29, 2024
3411400
unify adjustment for thunks
VSadov May 29, 2024
931e37e
Use CETCompat as condition. Narrow to x64.
VSadov May 29, 2024
7711ad8
Enable EHCONT, if CET and CFG are enabled
VSadov May 29, 2024
a0c798b
tweak comments
VSadov May 29, 2024
c991f59
Reconcile shadow stack with SP changes in RhpCallCatchFunclet
VSadov Jun 17, 2024
af84a14
Use RhFailFast for failfast
VSadov Jun 26, 2024
125b742
drop __fastcall in HijackFunc
VSadov Jun 26, 2024
4daf9cd
Apply suggestions from code review
VSadov Jun 26, 2024
ca52149
remove fastcall from RhpHijackForGcStress
VSadov Jun 26, 2024
024208a
Apply suggestions from code review
VSadov Jul 2, 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
Prev Previous commit
Next Next commit
Enable EHCONT, if CET and CFG are enabled
  • Loading branch information
@VSadov
VSadov committed Jul 1, 2024
commit 7711ad8d355b64134732903d46fa3b1e3a958520
2 changes: 2 additions & 0 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ The .NET Foundation licenses this file to you under the MIT license.
<LinkerArg Condition="'$(CETCompat)' != 'false' and '$(_targetArchitecture)' == 'x64'" Include="/CETCOMPAT" />
<!-- Allow user to opt out. -->
<LinkerArg Condition="'$(CETCompat)' == 'false' and '$(_targetArchitecture)' == 'x64'" Include="/CETCOMPAT:NO" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this future proofing in case CETCOMPAT is enabled by default by linker? (I do not think it is needed, but it does not hurt.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wanted to be explicit about this. But, yes, will also help if something defaults everything into "/CETCOMPAT"

<!-- Enable EHCONT if CET is not disabled and CFG is enabled. -->
<LinkerArg Condition="'$(CETCompat)' != 'false' and '$(_targetArchitecture)' == 'x64' and '$(ControlFlowGuard)' == 'Guard'" Include="/guard:ehcont"/>
</ItemGroup>

<ItemGroup Condition="!Exists('$(IlcSdkPath)debugucrt.txt')">
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/nativeaot/Runtime/amd64/ExceptionHandling.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ include asmmacros.inc
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
NESTED_ENTRY RhpThrowHwEx, _TEXT

ALTERNATE_ENTRY RhpThrowHwExGEHCONT ; this needs to be an EHCONT target since we'll be context-jumping here.

.GEHCONT RhpThrowHwExGEHCONT

SIZEOF_XmmSaves equ SIZEOF__PAL_LIMITED_CONTEXT - OFFSETOF__PAL_LIMITED_CONTEXT__Xmm6
STACKSIZEOF_ExInfo equ ((SIZEOF__ExInfo + 15) AND (NOT 15))

Expand Down