Changeset 103767 in vbox

Timestamp:

Mar 11, 2024 2:23:25 PM (9 months ago)

Author:

vboxsync

Message:

Additions: Linux: vboxsf: Few more fixes for UBSAN, bugref:10585.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• regops.c (modified) (2 diffs)
• utils.c (modified) (1 diff)

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

@@ -2536 +2536 @@
                 size_t iPage = cPages;
                 while (iPage-- > 0)
-                    pReq->PgLst.aPages[iPage] = page_to_phys(papPages[iPage]);
+                {
+                    RTGCPHYS64 * paDstPages = pReq->PgLst.aPages;
+                    paDstPages[iPage] = page_to_phys(papPages[iPage]);
+                }
+
                 pReq->PgLst.offFirstPage = (uint16_t)offPage0;
                 AssertStmt(cbChunk <= cbToRead, cbChunk = cbToRead);
@@ -2750 +2754 @@
                 size_t iPage = cPages;
                 while (iPage-- > 0)
-                    pReq->PgLst.aPages[iPage] = page_to_phys(papPages[iPage]);
+                {
+                    RTGCPHYS64 * paDstPages = pReq->PgLst.aPages;
+                    paDstPages[iPage] = page_to_phys(papPages[iPage]);
+                }
                 pReq->PgLst.offFirstPage = (uint16_t)offPage0;
                 AssertStmt(cbChunk <= cbToWrite, cbChunk = cbToWrite);

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

@@ -191 +191 @@
             pString = (PSHFLSTRING)kmalloc(SHFLSTRING_HEADER_SIZE + cchNls + 1, GFP_KERNEL);
             if (pString) {
+                char *pchDst = pString->String.ach;
                 pString->u16Length = (uint16_t)cchNls;
                 pString->u16Size   = (uint16_t)(cchNls + 1);
-                RT_BCOPY_UNFORTIFIED(pString->String.ach, pszNls, cchNls);
-                pString->String.ach[cchNls] = '\0';
+                RT_BCOPY_UNFORTIFIED(pchDst, pszNls, cchNls);
+                pchDst[cchNls] = '\0';
                 rc = 0;
             } else {