Changeset 59710 in vbox for trunk/src/VBox/HostServices/SharedFolders

Timestamp:

Feb 17, 2016 10:24:10 AM (9 years ago)

Author:

vboxsync

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

105567

Message:

SharedFolders: bugref:7765: handle deleted folders

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• mappings.cpp (modified) (11 diffs)
• mappings.h (modified) (2 diffs)
• service.cpp (modified) (1 diff)
• vbsf.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -79 +79 @@
     }
 
-    return VERR_INVALID_PARAMETER;
+    /* No corresponding mapping on the host but the guest still uses it.
+     * Add a 'placeholder' mapping.
+     */
+    LogRel2(("SharedFolders: mapping a placeholder for '%ls' -> '%s'\n",
+              pLoadedMapping->pMapName->String.ucs2, pLoadedMapping->pszFolderName));
+    return vbsfMappingsAdd(pLoadedMapping->pszFolderName, pLoadedMapping->pMapName,
+                           pLoadedMapping->fWritable, pLoadedMapping->fAutoMount,
+                           pLoadedMapping->fSymlinksCreate, /* fMissing = */ true, /* fPlaceholder = */ true);
 }
 
@@ -191 +198 @@
  * We are always executed from one specific HGCM thread. So thread safe.
  */
-int vbsfMappingsAdd(PSHFLSTRING pFolderName, PSHFLSTRING pMapName,
-                    bool fWritable, bool fAutoMount, bool fSymlinksCreate, bool fMissing)
+int vbsfMappingsAdd(const char *pszFolderName, PSHFLSTRING pMapName,
+                    bool fWritable, bool fAutoMount, bool fSymlinksCreate, bool fMissing, bool fPlaceholder)
 {
     unsigned i;
 
-    Assert(pFolderName && pMapName);
+    Assert(pszFolderName && pMapName);
 
     Log(("vbsfMappingsAdd %ls\n", pMapName->String.ucs2));
@@ -217 +224 @@
         if (FolderMapping[i].fValid == false)
         {
-            int rc = RTUtf16ToUtf8(pFolderName->String.ucs2, &FolderMapping[i].pszFolderName);
-            AssertRCReturn(rc, rc);
+            FolderMapping[i].pszFolderName = RTStrDup(pszFolderName);
+            if (!FolderMapping[i].pszFolderName)
+            {
+                return VERR_NO_MEMORY;
+            }
 
             FolderMapping[i].pMapName = (PSHFLSTRING)RTMemAlloc(ShflStringSizeOfBuffer(pMapName));
@@ -238 +248 @@
             FolderMapping[i].fSymlinksCreate = fSymlinksCreate;
             FolderMapping[i].fMissing        = fMissing;
+            FolderMapping[i].fPlaceholder    = fPlaceholder;
 
             /* Check if the host file system is case sensitive */
@@ -243 +254 @@
             char *pszAsciiRoot;
 
-            rc = RTStrUtf8ToCurrentCP(&pszAsciiRoot, FolderMapping[i].pszFolderName);
+            int rc = RTStrUtf8ToCurrentCP(&pszAsciiRoot, FolderMapping[i].pszFolderName);
             if (RT_SUCCESS(rc))
             {
@@ -258 +269 @@
     if (i == SHFL_MAX_MAPPINGS)
     {
-        AssertMsgFailed(("vbsfMappingsAdd: no more room to add mapping %ls to %ls!!\n", pFolderName->String.ucs2, pMapName->String.ucs2));
+        AssertLogRelMsgFailed(("vbsfMappingsAdd: no more room to add mapping %s to %ls!!\n", pszFolderName, pMapName->String.ucs2));
         return VERR_TOO_MUCH_DATA;
     }
@@ -291 +302 @@
                 if (FolderMapping[i].cMappings != 0)
                 {
-                    Log(("vbsfMappingsRemove: trying to remove active share %ls\n", pMapName->String.ucs2));
-                    return VERR_PERMISSION_DENIED;
+                    LogRel2(("SharedFolders: removing '%ls' -> '%s', which is still used by the guest\n",
+                             pMapName->String.ucs2, FolderMapping[i].pszFolderName));
+                    FolderMapping[i].fMissing = true;
+                    FolderMapping[i].fPlaceholder = true;
+                    return VINF_PERMISSION_DENIED;
                 }
+
+                /* pMapName can be the same as FolderMapping[i].pMapName,
+                 * log it before deallocating the memory.
+                 */
+                Log(("vbsfMappingsRemove: mapping %ls removed\n", pMapName->String.ucs2));
 
                 RTStrFree(FolderMapping[i].pszFolderName);
@@ -301 +320 @@
                 FolderMapping[i].fValid        = false;
                 vbsfRootHandleRemove(i);
-                break;
+                return VINF_SUCCESS;
             }
         }
     }
 
-    if (i == SHFL_MAX_MAPPINGS)
-    {
-        AssertMsgFailed(("vbsfMappingsRemove: mapping %ls not found!!!!\n", pMapName->String.ucs2));
-        return VERR_FILE_NOT_FOUND;
-    }
-    Log(("vbsfMappingsRemove: mapping %ls removed\n", pMapName->String.ucs2));
-    return VINF_SUCCESS;
+    AssertMsgFailed(("vbsfMappingsRemove: mapping %ls not found!!!!\n", pMapName->String.ucs2));
+    return VERR_FILE_NOT_FOUND;
 }
 
@@ -334 +348 @@
         return VERR_NOT_FOUND;
     *ppszRoot = pFolderMapping->pszFolderName;
-    *pcbRootLen = strlen(pFolderMapping->pszFolderName);
+    *pcbRootLen = (uint32_t)strlen(pFolderMapping->pszFolderName);
     return VINF_SUCCESS;
 }
@@ -468 +482 @@
 }
 
+/** Queries fWritable flag for the given root. Returns error if the root is not accessible.
+ */
 int vbsfMappingsQueryWritable(PSHFLCLIENTDATA pClient, SHFLROOT root, bool *fWritable)
 {
@@ -633 +649 @@
         pFolderMapping->cMappings--;
 
+    if (   pFolderMapping->cMappings == 0
+        && pFolderMapping->fPlaceholder)
+    {
+        /* Automatically remove, it is not used by the guest anymore. */
+        Assert(pFolderMapping->fMissing);
+        LogRel2(("SharedFolders: unmapping placeholder '%ls' -> '%s'\n",
+                pFolderMapping->pMapName->String.ucs2, pFolderMapping->pszFolderName));
+        vbsfMappingsRemove(pFolderMapping->pMapName);
+    }
+
     Log(("vbsfUnmapFolder\n"));
     return rc;

trunk/src/VBox/HostServices/SharedFolders/mappings.h

@@ -34 +34 @@
     bool        fMissing;             /**< mapping not invalid but host path does not exist.
                                            Any guest operation on such a folder fails! */
+    bool        fPlaceholder;         /**< mapping does not exist in the VM settings but the guest
+                                           still has. fMissing is always true for this mapping. */
 } MAPPING;
 /** Pointer to a MAPPING structure. */
@@ -42 +44 @@
 bool vbsfMappingQuery(uint32_t iMapping, PMAPPING *pMapping);
 
-int vbsfMappingsAdd(PSHFLSTRING pFolderName, PSHFLSTRING pMapName,
-                    bool fWritable, bool fAutoMount, bool fCreateSymlinks, bool fMissing);
+int vbsfMappingsAdd(const char *pszFolderName, PSHFLSTRING pMapName,
+                    bool fWritable, bool fAutoMount, bool fCreateSymlinks, bool fMissing, bool fPlaceholder);
 int vbsfMappingsRemove(PSHFLSTRING pMapName);
 

trunk/src/VBox/HostServices/SharedFolders/service.cpp

@@ -1340 +1340 @@
                         RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_MISSING) ? "true" : "false"));
 
-                /* Execute the function. */
-                rc = vbsfMappingsAdd(pFolderName, pMapName,
-                                     RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_WRITABLE),
-                                     RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_AUTOMOUNT),
-                                     RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_CREATE_SYMLINKS),
-                                     RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_MISSING));
+                char *pszFolderName;
+                rc = RTUtf16ToUtf8(pFolderName->String.ucs2, &pszFolderName);
+
                 if (RT_SUCCESS(rc))
                 {
-                    /* Update parameters.*/
-                    ; /* none */
+                    /* Execute the function. */
+                    rc = vbsfMappingsAdd(pszFolderName, pMapName,
+                                         RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_WRITABLE),
+                                         RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_AUTOMOUNT),
+                                         RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_CREATE_SYMLINKS),
+                                         RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_MISSING),
+                                         /* fPlaceholder = */ false);
+                    if (RT_SUCCESS(rc))
+                    {
+                        /* Update parameters.*/
+                        ; /* none */
+                    }
+                    RTStrFree(pszFolderName);
                 }
             }

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -960 +960 @@
     Log(("vbsfRead %RX64 offset %RX64 bytes %x\n", Handle, offset, *pcbBuffer));
 
+    /* Is the guest allowed to access this share?
+     * Checked here because the shared folder can be removed from the VM settings. */
+    bool fWritable;
+    rc = vbsfMappingsQueryWritable(pClient, root, &fWritable);
+    if (RT_FAILURE(rc))
+        return VERR_ACCESS_DENIED;
+
     if (*pcbBuffer == 0)
         return VINF_SUCCESS; /* @todo correct? */
@@ -1004 +1011 @@
 
     /* Is the guest allowed to write to this share?
-     * XXX Actually this check was still done in vbsfCreate() -- RTFILE_O_WRITE cannot be set if vbsfMappingsQueryWritable() failed. */
+     * Checked here because the shared folder can be removed from the VM settings. */
     bool fWritable;
     rc = vbsfMappingsQueryWritable(pClient, root, &fWritable);
@@ -1087 +1094 @@
         return VERR_INVALID_PARAMETER;
     }
+
+    /* Is the guest allowed to access this share?
+     * Checked here because the shared folder can be removed from the VM settings. */
+    bool fWritable;
+    rc = vbsfMappingsQueryWritable(pClient, root, &fWritable);
+    if (RT_FAILURE(rc))
+        return VERR_ACCESS_DENIED;
+
     Assert(pIndex && *pIndex == 0);
     DirHandle = pHandle->dir.Handle;