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

Timestamp:

Apr 17, 2023 2:25:25 PM (21 months ago)

Author:

vboxsync

Message:

linux/vboxsf: s/VBOX_LINUX_MEMCPY/VBSF_UNFORTIFIED_MEMCPY/g + explanation why and when to use. bugref:10209 ticketref:21410

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (6 diffs)
• regops.c (modified) (1 diff)
• utils.c (modified) (5 diffs)
• vfsmod.c (modified) (3 diffs)
• vfsmod.h (modified) (1 diff)

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

@@ -78 +78 @@
         pReq = (VBOXSFCREATEREQ *)VbglR0PhysHeapAlloc(RT_UOFFSETOF(VBOXSFCREATEREQ, StrPath.String) + sf_i->path->u16Size);
         if (pReq) {
-            VBOX_LINUX_MEMCPY(&pReq->StrPath, sf_i->path, SHFLSTRING_HEADER_SIZE + sf_i->path->u16Size);
+            VBSF_UNFORTIFIED_MEMCPY(&pReq->StrPath, sf_i->path, SHFLSTRING_HEADER_SIZE + sf_i->path->u16Size);
             RT_ZERO(pReq->CreateParms);
             pReq->CreateParms.Handle      = SHFL_HANDLE_NIL;
@@ -688 +688 @@
 
             RT_ZERO(*pReq);
-            VBOX_LINUX_MEMCPY(&pReq->StrPath, path, SHFLSTRING_HEADER_SIZE + path->u16Size);
+            VBSF_UNFORTIFIED_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;
@@ -824 +824 @@
         } *pReq = (union CreateAuxReq *)VbglR0PhysHeapAlloc(RT_UOFFSETOF(VBOXSFCREATEREQ, StrPath.String) + path->u16Size);
         if (pReq) {
-            VBOX_LINUX_MEMCPY(&pReq->Create.StrPath, path, SHFLSTRING_HEADER_SIZE + path->u16Size);
+            VBSF_UNFORTIFIED_MEMCPY(&pReq->Create.StrPath, path, SHFLSTRING_HEADER_SIZE + path->u16Size);
             RT_ZERO(pReq->Create.CreateParms);
             pReq->Create.CreateParms.Handle                  = SHFL_HANDLE_NIL;
@@ -1131 +1131 @@
                                                                        + path->u16Size);
         if (pReq) {
-            VBOX_LINUX_MEMCPY(&pReq->StrPath, path, SHFLSTRING_HEADER_SIZE + path->u16Size);
+            VBSF_UNFORTIFIED_MEMCPY(&pReq->StrPath, path, SHFLSTRING_HEADER_SIZE + path->u16Size);
             uint32_t fFlags = fDirectory ? SHFL_REMOVE_DIR : SHFL_REMOVE_FILE;
             if (dentry->d_inode && ((dentry->d_inode->i_mode & S_IFLNK) == S_IFLNK))
@@ -1251 +1251 @@
                     PSHFLSTRING             pOldPath = sf_file_i->path;
 
-                    VBOX_LINUX_MEMCPY(&pReq->StrDstPath, pNewPath, SHFLSTRING_HEADER_SIZE + pNewPath->u16Size);
+                    VBSF_UNFORTIFIED_MEMCPY(&pReq->StrDstPath, pNewPath, SHFLSTRING_HEADER_SIZE + pNewPath->u16Size);
                     rc = VbglR0SfHostReqRenameWithSrcContig(pSuperInfo->map.root, pReq, pOldPath, virt_to_phys(pOldPath), fRename);
                     VbglR0PhysHeapFree(pReq);
@@ -1352 +1352 @@
             if (pReq) {
                 RT_ZERO(*pReq);
-                VBOX_LINUX_MEMCPY(&pReq->StrSymlinkPath, pPath, SHFLSTRING_HEADER_SIZE + pPath->u16Size);
+                VBSF_UNFORTIFIED_MEMCPY(&pReq->StrSymlinkPath, pPath, SHFLSTRING_HEADER_SIZE + pPath->u16Size);
 
                 rc = VbglR0SfHostReqCreateSymlinkContig(pSuperInfo->map.root, pTarget, virt_to_phys(pTarget), pReq);

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

@@ -3073 +3073 @@
         return -ENOMEM;
     }
-    VBOX_LINUX_MEMCPY(&pReq->StrPath, sf_i->path, SHFLSTRING_HEADER_SIZE + sf_i->path->u16Size);
+    VBSF_UNFORTIFIED_MEMCPY(&pReq->StrPath, sf_i->path, SHFLSTRING_HEADER_SIZE + sf_i->path->u16Size);
     RT_ZERO(pReq->CreateParms);
     pReq->CreateParms.Handle = SHFL_HANDLE_NIL;

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

@@ -193 +193 @@
                 pString->u16Length = (uint16_t)cchNls;
                 pString->u16Size   = (uint16_t)(cchNls + 1);
-                VBOX_LINUX_MEMCPY(pString->String.ach, pszNls, cchNls);
+                VBSF_UNFORTIFIED_MEMCPY(pString->String.ach, pszNls, cchNls);
                 pString->String.ach[cchNls] = '\0';
                 rc = 0;
@@ -503 +503 @@
     if (pReq) {
         RT_ZERO(*pReq);
-        VBOX_LINUX_MEMCPY(&pReq->StrPath, path, SHFLSTRING_HEADER_SIZE + path->u16Size);
+        VBSF_UNFORTIFIED_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;
@@ -589 +589 @@
                 if (pReq) {
                     RT_ZERO(*pReq);
-                    VBOX_LINUX_MEMCPY(&pReq->StrPath, pPath, SHFLSTRING_HEADER_SIZE + pPath->u16Size);
+                    VBSF_UNFORTIFIED_MEMCPY(&pReq->StrPath, pPath, SHFLSTRING_HEADER_SIZE + pPath->u16Size);
                     pReq->CreateParms.Handle      = SHFL_HANDLE_NIL;
                     pReq->CreateParms.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
@@ -890 +890 @@
                     if (fAttrs & ATTR_SIZE)
                         pReq->Create.CreateParms.CreateFlags |= SHFL_CF_ACCESS_WRITE;
-                    VBOX_LINUX_MEMCPY(&pReq->Create.StrPath, sf_i->path, SHFLSTRING_HEADER_SIZE + sf_i->path->u16Size);
+                    VBSF_UNFORTIFIED_MEMCPY(&pReq->Create.StrPath, sf_i->path, SHFLSTRING_HEADER_SIZE + sf_i->path->u16Size);
                     vrc = VbglR0SfHostReqCreate(pSuperInfo->map.root, &pReq->Create);
                     if (RT_SUCCESS(vrc)) {
@@ -1028 +1028 @@
 
     if (fRoot)
-        VBOX_LINUX_MEMCPY(&tmp->String.utf8[0], d_name, d_len + 1);
+        VBSF_UNFORTIFIED_MEMCPY(&tmp->String.utf8[0], d_name, d_len + 1);
     else {
-        VBOX_LINUX_MEMCPY(&tmp->String.utf8[0], p_name, p_len);
+        VBSF_UNFORTIFIED_MEMCPY(&tmp->String.utf8[0], p_name, p_len);
         tmp->String.utf8[p_len] = '/';
-        VBOX_LINUX_MEMCPY(&tmp->String.utf8[p_len + 1], d_name, d_len);
+        VBSF_UNFORTIFIED_MEMCPY(&tmp->String.utf8[p_len + 1], d_name, d_len);
         tmp->String.utf8[p_len + 1 + d_len] = '\0';
     }

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

@@ -119 +119 @@
     if ((unsigned)info->length >= RT_UOFFSETOF(struct vbsf_mount_info_new, cMaxIoPages)) {
         AssertCompile(sizeof(pSuperInfo->szTag) >= sizeof(info->szTag));
-        VBOX_LINUX_MEMCPY(pSuperInfo->szTag, info->szTag, sizeof(info->szTag));
+        VBSF_UNFORTIFIED_MEMCPY(pSuperInfo->szTag, info->szTag, sizeof(info->szTag));
         pSuperInfo->szTag[sizeof(pSuperInfo->szTag) - 1] = '\0';
     } else {
@@ -243 +243 @@
         str_name->u16Length = name_len;
         str_name->u16Size = name_len + 1;
-        VBOX_LINUX_MEMCPY(str_name->String.utf8, info->name, name_len + 1);
+        VBSF_UNFORTIFIED_MEMCPY(str_name->String.utf8, info->name, name_len + 1);
 
         /*
@@ -1490 +1490 @@
     if (data) {
         if (VBSF_IS_MOUNT_VBOXSF_DATA(data)) {
-            VBOX_LINUX_MEMCPY(info, data, sizeof(struct vbsf_mount_info_new));
+            VBSF_UNFORTIFIED_MEMCPY(info, data, sizeof(struct vbsf_mount_info_new));
         } else {
             /* this will call vbsf_parse_param() */

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

@@ -80 +80 @@
 
 
-/* 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.  */
+/** Similar workaround for CONFIG_FORTIFY_SOURCE kernel config option as we
+ * have in the host drivers.
+ *
+ * In Linux 5.18-rc1, memcpy became a wrapper which does fortify checks before
+ * making a call to __underlying_memcpy().  There are a number of places where
+ * we trigger the "field-spanning write" fortify check, typically when copying
+ * to SHFLSTRING structure members as these are actually of variable length but
+ * we don't (cannot with gcc) use RT_FLEXIBLE_ARRAY_NESTED. 
+ * 
+ * Use this when copying to structures or members with a variable length member.
+ *
+ * @see @ticketref{21410}, @bugref{10209}
+ */
 #if RTLNX_VER_MIN(5,18,0) && !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
-# define VBOX_LINUX_MEMCPY __underlying_memcpy
+# define VBSF_UNFORTIFIED_MEMCPY __underlying_memcpy
 #else
-#define VBOX_LINUX_MEMCPY  memcpy
+# define VBSF_UNFORTIFIED_MEMCPY memcpy
 #endif