Changeset 104954 in vbox

Timestamp:

Jun 18, 2024 11:14:14 AM (7 months ago)

Author:

vboxsync

Message:

Additions/solaris/vboxfs_mount,Additions/VBoxService/VBoxServiceAutoMount:
The Solaris mount(2) system call limits the size of the mount options
buffer to MAX_MNTOPT_STR from <sys/mount.h> (currently 1024). Passing a
buffer size larger than this results in a failure with mount(2)
returning EINVAL which in this case prevents users from being able to
mount shared folders by hand. Undo a regression introduced in r158032.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxService/VBoxServiceAutoMount.cpp (modified) (7 diffs)
• solaris/SharedFolders/vboxfs_mount.c (modified) (2 diffs)

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

@@ -389 +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;
-        RTStrPrintf(pszOpts, cbOpts, "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000", grp_vboxsf->gr_gid);
+        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);
         int r = mount(pszShareName,
                       pszMountPoint,
@@ -402 +399 @@
                       NULL,                     /* char *dataptr */
                       0,                        /* int datalen */
-                      pszOpts,
-                      cbOpts);
+                      szOptBuf,
+                      sizeof(szOptBuf));
         if (r == 0)
             VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
@@ -411 +408 @@
 
 # else /* RT_OS_LINUX */
+        uint32_t cbOpts = RTSystemGetPageSize();
+        char *pszOpts = (char *)alloca(cbOpts);
+        RT_BZERO(pszOpts, cbOpts);
         struct utsname uts;
         AssertStmt(uname(&uts) != -1, strcpy(uts.release, "4.4.0"));
@@ -1469 +1469 @@
     }
 
+#  if defined(RT_OS_LINUX)
+    /*
+     * Linux a bit more work...
+     */
+    struct utsname uts;
+    AssertStmt(uname(&uts) != -1, strcpy(uts.release, "4.4.0"));
     /*
      * Allocate options string buffer which is limited to a page on most systems.
@@ -1474 +1480 @@
     uint32_t cbOpts = RTSystemGetPageSize();
     char *pszOpts = (char *)alloca(cbOpts);
-
-#  if defined(RT_OS_LINUX)
-    /*
-     * Linux a bit more work...
-     */
-    struct utsname uts;
-    AssertStmt(uname(&uts) != -1, strcpy(uts.release, "4.4.0"));
 
     /* Built mount option string.  Need st_name for pre 2.6.0 kernels. */
@@ -1538 +1537 @@
      *       with EOVERFLOW in vfs_buildoptionstr() during domount() otherwise.
      */
-    ssize_t cchOpts = RTStrPrintf2(pszOpts, cbOpts,
+    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,tag=%s", gidMount, g_szTag);
     if (cchOpts <= 0)
     {
-        VGSvcError("vbsvcAutomounterMountIt: pszOpts overflow! %zd\n", cchOpts);
+        VGSvcError("vbsvcAutomounterMountIt: szOpts overflow! %zd\n", cchOpts);
         return VERR_BUFFER_OVERFLOW;
     }
 
     rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, MS_OPTIONSTR, "vboxfs",
-               NULL /*dataptr*/, 0 /* datalen */, pszOpts, MAX_MNTOPT_STR);
+               NULL /*dataptr*/, 0 /* datalen */, szOpts, MAX_MNTOPT_STR);
     if (rc == 0)
     {
@@ -1556 +1556 @@
 
     rc = errno;
-    VGSvcError("vbsvcAutomounterMountIt: mount failed for '%s' on '%s' (pszOpts=%s): %s (%d)\n",
-               pEntry->pszName, pEntry->pszActualMountPoint, pszOpts, strerror(rc), rc);
+    VGSvcError("vbsvcAutomounterMountIt: mount failed for '%s' on '%s' (szOpts=%s): %s (%d)\n",
+               pEntry->pszName, pEntry->pszActualMountPoint, szOpts, strerror(rc), rc);
     return VERR_OPEN_FAILED;
 

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c

@@ -47 +47 @@
 #include <sys/mount.h>
 
-#include <iprt/param.h> /* For PAGE_SIZE */
-
 #include "vboxfs.h"
 
@@ -55 +53 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-static char g_achOptBuf[PAGE_SIZE] = { '\0', };
+static char g_achOptBuf[MAX_MNTOPT_STR] = { '\0', };
 static const int g_RetErr = 33;
 static const int g_RetMagic = 2;