Changeset 78585 in vbox for trunk/src/VBox

Timestamp:

May 19, 2019 12:35:21 AM (6 years ago)

Author:

vboxsync

Message:

winnt/vboxsf: Do locking around the CcCoherencyFlushAndPurgeCache calls similar to what RDBSS does in the common read/write functions when calling CcFlushCache. bugref:9172

Location:

trunk/src/VBox/Additions/WINNT/SharedFolders/driver

Files:

• file.cpp (modified) (2 diffs)
• info.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.cpp

@@ -128 +128 @@
                 LARGE_INTEGER offFlush;
                 offFlush.QuadPart = offFile;
+                Assert(!RxContext->FcbPagingIoResourceAcquired);
+                BOOLEAN AcquiredFile = RxAcquirePagingIoResourceShared(NULL, capFcb, 1 /*fWait*/);
                 g_pfnCcCoherencyFlushAndPurgeCache(&RxContext->NonPagedFcb->SectionObjectPointers, &offFlush, cbChunk,
                                                    &RxContext->CurrentIrp->IoStatus, CC_FLUSH_AND_PURGE_NO_PURGE);
+                if (AcquiredFile)
+                {   RxReleasePagingIoResource(NULL, capFcb); /* requires {} */ }
             }
 
@@ -383 +387 @@
                 && RxContext->NonPagedFcb->SectionObjectPointers.DataSectionObject != NULL)
             {
-                /** @todo locking.   */
                 LARGE_INTEGER offFlush;
                 offFlush.QuadPart = offFile;
+                BOOLEAN fAcquiredLock = RxAcquirePagingIoResource(NULL, capFcb);
                 g_pfnCcCoherencyFlushAndPurgeCache(&RxContext->NonPagedFcb->SectionObjectPointers, &offFlush, cbChunk,
                                                    &RxContext->CurrentIrp->IoStatus, 0 /*fFlags*/);
+                if (fAcquiredLock)
+                {   RxReleasePagingIoResource(NULL, capFcb); /* requires {} */ }
             }
 

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.cpp

@@ -1162 +1162 @@
      *       macros in need of {} wrappers when used with if statements.
      */
-    NTSTATUS rcNtLock = RxAcquirePagingIoResource(NULL, pFcb);
+    BOOLEAN fAcquiredLock = RxAcquirePagingIoResource(NULL, pFcb);
 
     LONGLONG cbFileOldRecheck;
@@ -1211 +1211 @@
 
                 /* RDBSS leave the lock before calling CcSetFileSizes, so we do that too then.*/
-                if (NT_SUCCESS(rcNtLock))
-                {
-                    RxReleasePagingIoResource(NULL, pFcb);
-                }
+                if (fAcquiredLock)
+                {   RxReleasePagingIoResource(NULL, pFcb); /* requires {} */ }
 
                 __try
@@ -1242 +1240 @@
              cbFileOld, cbFileNew, cbFileOldRecheck));
 
-    if (NT_SUCCESS(rcNtLock))
-    {
-        RxReleasePagingIoResource(NULL, pFcb); /* requires {} */
-    }
+    if (fAcquiredLock)
+    {   RxReleasePagingIoResource(NULL, pFcb); /* requires {} */ }
 }