Changeset 103723 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Mar 7, 2024 10:20:39 AM (12 months ago)

Author:

vboxsync

Message:

Linux: SUPDrvTracer.cpp: Annotate indirect jumps to instruct objtool that such jump is vouched safe for retpoline build, bugref:10617.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp

@@ -56 +56 @@
 #include <iprt/uuid.h>
 
+#if RTLNX_VER_MIN(4,15,10)
+# include <asm/nospec-branch.h>
+#endif
+#if RTLNX_VER_MIN(5,17,0)
+# include <asm/linkage.h>
+#endif
 
 /*********************************************************************************************************************************
@@ -1498 +1504 @@
 __asm__("\
             movq    g_pfnSupdrvProbeFireKernel(%rip), %rax              \n\
+            "
+#  if RTLNX_VER_MIN(4,15,10)
+            ANNOTATE_RETPOLINE_SAFE
+#  endif
+            " \n\
             jmp     *%rax \n\
 ");
@@ -1503 +1514 @@
 __asm__("\
             movl    g_pfnSupdrvProbeFireKernel, %eax                    \n\
+            "
+#  if RTLNX_VER_MIN(4,15,10)
+            ANNOTATE_RETPOLINE_SAFE
+#  endif
+            " \n\
             jmp     *%eax \n\
 ");
@@ -1514 +1530 @@
         .global supdrvTracerProbeFireStub                               \n\
 supdrvTracerProbeFireStub:                                              \n\
-        ret                                                             \n\
-        .size supdrvTracerProbeFireStub, . - supdrvTracerProbeFireStub  \n\
+        "
+#  if RTLNX_VER_MIN(5,17,0)
+        ASM_RET "\n\
+        "
+#  else
+        "ret \n\
+        "
+#  endif
+        ".size supdrvTracerProbeFireStub, . - supdrvTracerProbeFireStub  \n\
                                                                         \n\
         .previous                                                       \n\