Changeset 100317 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jun 28, 2023 10:34:21 AM (23 months ago)

Author:

vboxsync

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

158032

Message:

Additions: Get rid of MAX_MNTOPT_STR and replace with RTSystemGetPageSize() in the shared folders mounting tools, bugref:10476

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp (modified) (12 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp

@@ -55 +55 @@
 #include <iprt/sort.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 #include <VBox/err.h>
 #include <VBox/VBoxGuestLib.h>
@@ -68 +69 @@
 # include <os2emx.h>
 #else
+# include <alloca.h>
 # include <errno.h>
 # include <grp.h>
@@ -387 +389 @@
     if (RT_SUCCESS(rc))
     {
+        uint32_t cbOpts = RTSystemGetPageSize();
+        char *pszOpts = (char *)alloca(cbOpts);
+        RT_BZERO(pszOpts, cbOpts);
+
 # ifdef RT_OS_SOLARIS
         int const fFlags = MS_OPTIONSTR;
-        char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
-        RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000", grp_vboxsf->gr_gid);
+        RTStrPrintf(pszOptBuf, sizeof(szOptBuf), "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000", grp_vboxsf->gr_gid);
         int r = mount(pszShareName,
                       pszMountPoint,
@@ -397 +402 @@
                       NULL,                     /* char *dataptr */
                       0,                        /* int datalen */
-                      szOptBuf,
-                      sizeof(szOptBuf));
+                      pszOpts,
+                      cbOpts);
         if (r == 0)
             VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
@@ -410 +415 @@
 
         unsigned long const fFlags = MS_NODEV;
-        char szOpts[MAX_MNTOPT_STR] = { '\0' };
-        ssize_t cchOpts = RTStrPrintf2(szOpts, sizeof(szOpts), "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000",
+        ssize_t cchOpts = RTStrPrintf2(pszOpts, cbOpts, "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000",
                                        grp_vboxsf->gr_gid);
         if (cchOpts > 0 && RTStrVersionCompare(uts.release, "2.6.0") < 0)
-            cchOpts = RTStrPrintf2(&szOpts[cchOpts], sizeof(szOpts) - cchOpts, ",sf_name=%s", pszShareName);
+            cchOpts = RTStrPrintf2(&pszOpts[cchOpts], cbOpts - cchOpts, ",sf_name=%s", pszShareName);
         if (cchOpts <= 0)
         {
-            VGSvcError("vbsvcAutomounterMountIt: szOpts overflow! %zd (share %s)\n", cchOpts, pszShareName);
+            VGSvcError("vbsvcAutomounterMountIt: pszOpts overflow! %zd (share %s)\n", cchOpts, pszShareName);
             return VERR_BUFFER_OVERFLOW;
         }
@@ -425 +429 @@
                       "vboxsf",
                       fFlags,
-                      szOpts);
+                      pszOpts);
         if (r == 0)
         {
             VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
 
-            r = vbsfmount_complete(pszShareName, pszMountPoint, fFlags, szOpts);
+            r = vbsfmount_complete(pszShareName, pszMountPoint, fFlags, pszOpts);
             switch (r)
             {
@@ -1465 +1469 @@
     }
 
+    /*
+     * Allocate options string buffer which is limited to a page on most systems.
+     */
+    uint32_t cbOpts = RTSystemGetPageSize();
+    char *pszOpts = (char *)alloca(cbOpts);
+
 #  if defined(RT_OS_LINUX)
     /*
@@ -1474 +1484 @@
     /* Built mount option string.  Need st_name for pre 2.6.0 kernels. */
     unsigned long const fFlags = MS_NODEV;
-    char szOpts[MAX_MNTOPT_STR] = { '\0' };
-    ssize_t cchOpts = RTStrPrintf2(szOpts, sizeof(szOpts),
+    ssize_t cchOpts = RTStrPrintf2(pszOpts, cbOpts,
                                    "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000,tag=%s", gidMount, g_szTag);
     if (RTStrVersionCompare(uts.release, "2.6.0") < 0 && cchOpts > 0)
-        cchOpts += RTStrPrintf2(&szOpts[cchOpts], sizeof(szOpts) - cchOpts, ",sf_name=%s", pEntry->pszName);
+        cchOpts += RTStrPrintf2(&pszOpts[cchOpts], cbOpts - cchOpts, ",sf_name=%s", pEntry->pszName);
     if (cchOpts <= 0)
     {
-        VGSvcError("vbsvcAutomounterMountIt: szOpts overflow! %zd\n", cchOpts);
+        VGSvcError("vbsvcAutomounterMountIt: pszOpts overflow! %zd\n", cchOpts);
         return VERR_BUFFER_OVERFLOW;
     }
@@ -1488 +1497 @@
        which lagged a lot behind when it first appeared in 5.6. */
     errno = 0;
-    rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, "vboxsf", fFlags, szOpts);
+    rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, "vboxsf", fFlags, pszOpts);
     if (rc != 0 && errno == EINVAL && RTStrVersionCompare(uts.release, "5.6.0") >= 0)
     {
         VGSvcVerbose(2, "vbsvcAutomounterMountIt: mount returned EINVAL, retrying without the tag.\n");
-        *strstr(szOpts, ",tag=") = '\0';
+        *strstr(pszOpts, ",tag=") = '\0';
         errno = 0;
-        rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, "vboxsf", fFlags, szOpts);
+        rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, "vboxsf", fFlags, pszOpts);
         if (rc == 0)
             VGSvcVerbose(0, "vbsvcAutomounterMountIt: Running outdated vboxsf module without support for the 'tag' option?\n");
@@ -1504 +1513 @@
 
         errno = 0;
-        rc = vbsfmount_complete(pEntry->pszName, pEntry->pszActualMountPoint, fFlags, szOpts);
+        rc = vbsfmount_complete(pEntry->pszName, pEntry->pszActualMountPoint, fFlags, pszOpts);
         if (rc != 0) /* Ignorable. /etc/mtab is probably a link to /proc/mounts. */
             VGSvcVerbose(1, "vbsvcAutomounterMountIt: vbsfmount_complete failed: %s (%d/%d)\n",
@@ -1529 +1538 @@
      *       with EOVERFLOW in vfs_buildoptionstr() during domount() otherwise.
      */
-    char szOpts[MAX_MNTOPT_STR] = { '\0', };
-    ssize_t cchOpts = RTStrPrintf2(szOpts, sizeof(szOpts),
+    ssize_t cchOpts = RTStrPrintf2(pszOpts, cbOpts,
                                    "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000,tag=%s", gidMount, g_szTag);
     if (cchOpts <= 0)
     {
-        VGSvcError("vbsvcAutomounterMountIt: szOpts overflow! %zd\n", cchOpts);
+        VGSvcError("vbsvcAutomounterMountIt: pszOpts overflow! %zd\n", cchOpts);
         return VERR_BUFFER_OVERFLOW;
     }
 
     rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, MS_OPTIONSTR, "vboxfs",
-               NULL /*dataptr*/, 0 /* datalen */, szOpts, MAX_MNTOPT_STR);
+               NULL /*dataptr*/, 0 /* datalen */, pszOpts, MAX_MNTOPT_STR);
     if (rc == 0)
     {
@@ -1548 +1556 @@
 
     rc = errno;
-    VGSvcError("vbsvcAutomounterMountIt: mount failed for '%s' on '%s' (szOpts=%s): %s (%d)\n",
-               pEntry->pszName, pEntry->pszActualMountPoint, szOpts, strerror(rc), rc);
+    VGSvcError("vbsvcAutomounterMountIt: mount failed for '%s' on '%s' (pszOpts=%s): %s (%d)\n",
+               pEntry->pszName, pEntry->pszActualMountPoint, pszOpts, strerror(rc), rc);
     return VERR_OPEN_FAILED;