Changeset 103726 in vbox

Timestamp:

Mar 7, 2024 10:45:05 AM (7 months ago)

Author:

vboxsync

Message:

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

Make changes specific to Linux only.

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
+#if defined(RT_OS_LINUX)
+# if RTLNX_VER_MIN(4,15,10)
+#  include <asm/nospec-branch.h>
+# endif /* < 4.15.10 */
+# if RTLNX_VER_MIN(5,17,0)
+#  include <asm/linkage.h>
+# endif /* < 5.17.0 */
+#endif /* !RT_OS_LINUX */
 
 /*********************************************************************************************************************************
@@ -1505 +1507 @@
             movq    g_pfnSupdrvProbeFireKernel(%rip), %rax              \n\
             "
-#  if RTLNX_VER_MIN(4,15,10)
+#  if defined(RT_OS_LINUX)
+#   if RTLNX_VER_MIN(4,15,10)
             ANNOTATE_RETPOLINE_SAFE
+#   endif
 #  endif
             " \n\
@@ -1515 +1519 @@
             movl    g_pfnSupdrvProbeFireKernel, %eax                    \n\
             "
-#  if RTLNX_VER_MIN(4,15,10)
+#  if defined(RT_OS_LINUX)
+#   if RTLNX_VER_MIN(4,15,10)
             ANNOTATE_RETPOLINE_SAFE
+#   endif
 #  endif
             " \n\
@@ -1531 +1537 @@
 supdrvTracerProbeFireStub:                                              \n\
         "
+# if defined(RT_OS_LINUX)
 #  if RTLNX_VER_MIN(5,17,0)
         ASM_RET "\n\
         "
-#  else
+#  else /* < 5.17.0 */
         "ret \n\
         "
-#  endif
+#  endif /* < 5.17.0 */
+# else /* !RT_OS_LINUX */
+        "ret \n\
+        "
+# endif /* !RT_OS_LINUX */
         ".size supdrvTracerProbeFireStub, . - supdrvTracerProbeFireStub  \n\
                                                                         \n\