Changeset 94503 in vbox

Timestamp:

Apr 6, 2022 5:24:39 PM (3 years ago)

Author:

vboxsync

Message:

Linux: Host Drivers: SUPDrv: fix build for non-linux platforms, ​bugref:10209.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp (modified) (2 diffs)

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

@@ -74 +74 @@
 # define VBOXDRV_IOCTL_ENTRY(pvSession, uIOCtl, pvReqHdr) do { } while (0)
 # define VBOXDRV_IOCTL_RETURN(pvSession, uIOCtl, pvReqHdr, rcRet, rcReq) do { } while (0)
+#endif
+
+#if defined(RT_OS_LINUX)
+/* In Linux 5.18-rc1, memcpy became a wrapper which does fortify checks
+ * before triggering __underlying_memcpy() call. We do not pass these checks here,
+ * so bypass them for now.  */
+# if RTLNX_VER_MIN(5,18,0)
+#  define SUPDRV_MEMCPY __underlying_memcpy
+# else
+# define SUPDRV_MEMCPY  memcpy
+# endif
+#else
+# define SUPDRV_MEMCPY  memcpy
 #endif
 
@@ -1752 +1765 @@
             /* execute */
             pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions);
-
-            /* In 5.18.0, memcpy became a wrapper which does fortify checks
-             * before triggering __underlying_memcpy() call. We do not pass these checks here,
-             * so bypass them for now.  */
-#if RTLNX_VER_MIN(5,18,0)
-            __underlying_memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
-#else
-            memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
-#endif
+            SUPDRV_MEMCPY(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
             pReq->Hdr.rc = VINF_SUCCESS;
             return 0;