Changeset 75451 in vbox

Timestamp:

Nov 14, 2018 2:28:26 PM (6 years ago)

Author:

vboxsync

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

126606

Message:

VBoxService/Automounter: Another vboxsf->vboxsf typo for solaris. Also discovered that mount failed with EOVERFLOW if option buffer too small. Corrected some logging. bugref:3544

File:

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

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

@@ -996 +996 @@
         struct mnttab Entry;
         while (getmntent(pFile, &Entry) == 0)
-            if (strcmp(Entry.mnt_fstype, "vboxsf") == 0)
+            if (strcmp(Entry.mnt_fstype, "vboxfs") == 0)
             {
                 /* Look for the dummy automounter option. */
@@ -1156 +1156 @@
                     {
                         VGSvcVerbose(3, "vbsvcAutomounterQueryMountPoint: Found shared folder '%s' at '%s'.\n",
-                                     pszMountPoint, pszName);
+                                     pszName, pszMountPoint);
                         rc = VINF_SUCCESS;
                     }
@@ -1220 +1220 @@
             {
                 VGSvcVerbose(3, "vbsvcAutomounterQueryMountPoint: Found shared folder '%s' at '%s'.\n",
-                             pszMountPoint, pszName);
+                             pszName, pszMountPoint);
                 rc = VINF_SUCCESS;
             }
@@ -1267 +1267 @@
                     {
                         VGSvcVerbose(3, "vbsvcAutomounterQueryMountPoint: Found shared folder '%s' at '%s'.\n",
-                                     pszMountPoint, pszName);
+                                     pszName, pszMountPoint);
                         rc = VINF_SUCCESS;
                     }
@@ -1313 +1313 @@
                     {
                         VGSvcVerbose(3, "vbsvcAutomounterQueryMountPoint: Found shared folder '%s' at '%s'.\n",
-                                     pszMountPoint, pszName);
+                                     pszName, pszMountPoint);
                         rc = VINF_SUCCESS;
                     }
@@ -1511 +1511 @@
      * The ',VBoxService=auto' option (g_szTag) is ignored by the kernel but helps
      * us identify our own mounts on restart.  See vbsvcAutomounterPopulateTable().
+     *
+     * Note! Must pass MAX_MNTOPT_STR rather than cchOpts to mount, as it may fail
+     *       with EOVERFLOW in vfs_buildoptionstr() during domount() otherwise.
      */
     char szOpts[MAX_MNTOPT_STR] = { '\0', };
@@ -1522 +1525 @@
 
     rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, MS_OPTIONSTR, "vboxfs",
-               NULL /*dataptr*/, 0 /* datalen */, szOpts, cchOpts + 1);
+               NULL /*dataptr*/, 0 /* datalen */, szOpts, MAX_MNTOPT_STR);
     if (rc == 0)
     {