Changeset 98096 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jan 16, 2023 4:16:36 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155230

Message:

Additions: Linux: vboxsf: suppress false-positive warning caused by CONFIG_FORTIFY_SOURCE kernel config option, bugref:10209, ticketref:21410.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (1 diff)
• vfsmod.h (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -688 +688 @@
 
             RT_ZERO(*pReq);
-            memcpy(&pReq->StrPath, path, SHFLSTRING_HEADER_SIZE + path->u16Size);
+            VBOX_LINUX_MEMCPY(&pReq->StrPath, path, SHFLSTRING_HEADER_SIZE + path->u16Size);
             pReq->CreateParms.Handle = SHFL_HANDLE_NIL;
             pReq->CreateParms.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h

@@ -77 +77 @@
 # define SFLOG_ENABLED          1
 # define SFLOGRELBOTH(aArgs)    do { RTLogBackdoorPrintf aArgs; printk aArgs; } while (0)
+#endif
+
+
+/* Simmilar workaround for CONFIG_FORTIFY_SOURCE kernel config option as we have for host drivers.
+ * In Linux 5.18-rc1, memcpy became a wrapper which does fortify checks
+ * before triggering __underlying_memcpy() call. We do not pass these checks in some places so
+ * bypass them for now.  */
+#if RTLNX_VER_MIN(5,18,0) && !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
+# define VBOX_LINUX_MEMCPY __underlying_memcpy
+#else
+#define VBOX_LINUX_MEMCPY  memcpy
 #endif