Changeset 101358 in vbox

Timestamp:

Oct 5, 2023 3:24:57 PM (16 months ago)

Author:

vboxsync

Message:

Linux: vboxdrv: Replace SUPDRV_UNFORTIFIED_MEMCPY with RT_BCOPY_UNFORTIFIED, bugref:10209.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.cpp (modified) (1 diff)
• SUPDrvInternal.h (modified) (2 diffs)
• SUPDrvTracer.cpp (modified) (1 diff)

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

@@ -1765 +1765 @@
             /* execute */
             pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions);
-            SUPDRV_UNFORTIFIED_MEMCPY(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
+            RT_BCOPY_UNFORTIFIED(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
             pReq->Hdr.rc = VINF_SUCCESS;
             return 0;

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -243 +243 @@
 #       endif
 #   endif
-#   if (RTLNX_VER_MIN(5,18,0) || RTLNX_RHEL_RANGE(9,3, 9,99)) && !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
-#    define SUPDRV_UNFORTIFIED_MEMCPY __underlying_memcpy
-#   endif
 #   define SUPR0_EXPORT_SYMBOL(a_Name) EXPORT_SYMBOL(a_Name)
 
@@ -375 +372 @@
  * @todo Test on servers with many CPUs and sockets. */
 # define SUPDRV_USE_TSC_DELTA_THREAD
-#endif
-
-/** @def SUPDRV_UNFORTIFIED_MEMCPY
- * Use when copying to variable length structures, it prevents a fortified
- * memcpy (linux 5.18+) from complaining about "field-spanning writes".
- *
- * @see @ticketref{21410}, @bugref{10209}
- */
-#if !defined(SUPDRV_UNFORTIFIED_MEMCPY) || defined(DOXYGEN_RUNNING) /* (Already defined above if fortified.) */
-# define SUPDRV_UNFORTIFIED_MEMCPY memcpy
 #endif
 

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

@@ -999 +999 @@
 
             if (!pUmod)
-                SUPDRV_UNFORTIFIED_MEMCPY(pProv->szName, pszName, cchName + 1);
+                RT_BCOPY_UNFORTIFIED(pProv->szName, pszName, cchName + 1);
             else
                 RTStrPrintf(pProv->szName, cchName + 1, "%s%u", pszName, (uint32_t)pSession->Process);
-            SUPDRV_UNFORTIFIED_MEMCPY((void *)pProv->Core.pszModName, pszModName, cchModName + 1);
+            RT_BCOPY_UNFORTIFIED((void *)pProv->Core.pszModName, pszModName, cchModName + 1);
 
             /*