add __CET__ check guards to trampoline assembly (JuliaLang#38683)

Fixes JuliaLang#38680
Cthulhoni · Dec 3, 2020 · 9631a9f · 9631a9f
1 parent 7d5c0c5
commit 9631a9f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/cli/trampolines/trampolines_i686.S b/cli/trampolines/trampolines_i686.S
@@ -12,12 +12,18 @@
 #define DEBUGINFO(name)
 #endif
 
+#if defined(__CET__) && __CET__ & 1 != 0
+#define CET_START() endbr32
+#else
+#define CET_START()
+#endif
+
 #define XX(name) \
 DEBUGINFO(name); \
 .global name; \
 .cfi_startproc; \
 name##:; \
-    endbr32; \
+    CET_START(); \
     jmpl *(CNAME(name##_addr)); \
     ud2; \
 .cfi_endproc; \

diff --git a/cli/trampolines/trampolines_x86_64.S b/cli/trampolines/trampolines_x86_64.S
@@ -26,14 +26,20 @@
 #define SEH_END()
 #endif
 
+#if defined(__CET__) && __CET__ & 1 != 0
+#define CET_START() endbr64
+#else
+#define CET_START()
+#endif
+
 #define XX(name) \
 DEBUGINFO(name); \
 .global name; \
 .cfi_startproc; \
 SEH_START1(name); \
 name##:; \
 SEH_START2(); \
-    endbr64; \
+    CET_START(); \
     mov CNAME(name##_addr)(%rip),%rax; \
     jmpq *%rax; \
     ud2; \