Changeset 56589 in vbox for trunk/src/VBox

Timestamp:

Jun 22, 2015 9:15:52 PM (9 years ago)

Author:

vboxsync

Message:

Network/NetLwf: listModules access and modification fixes (#7231)

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp

@@ -802 +802 @@
     pModuleCtx->hFilter   = hFilter;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Attaching);
-    /* Insert into module chain */
-    NdisAcquireSpinLock(&pGlobals->Lock);
-    RTListPrepend(&pGlobals->listModules, &pModuleCtx->node);
-    NdisReleaseSpinLock(&pGlobals->Lock);
     /* Initialize transmission mutex and events */
     NDIS_INIT_MUTEX(&pModuleCtx->InTransmit);
@@ -855 +851 @@
         return NDIS_STATUS_RESOURCES;
     }
+    /* Insert into module chain */
+    NdisAcquireSpinLock(&pGlobals->Lock);
+    RTListPrepend(&pGlobals->listModules, &pModuleCtx->node);
+    NdisReleaseSpinLock(&pGlobals->Lock);
 
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Paused);
@@ -2333 +2333 @@
     RtlInitAnsiString(&strInst, pThis->szName);
     PVBOXNETLWF_MODULE pModuleCtx = NULL;
+    NdisAcquireSpinLock(&g_VBoxNetLwfGlobals.Lock);
     RTListForEach(&g_VBoxNetLwfGlobals.listModules, pModuleCtx, VBOXNETLWF_MODULE, node)
     {
@@ -2338 +2339 @@
         if (RtlEqualString(&strInst, &pModuleCtx->strMiniportName, TRUE))
         {
+            NdisReleaseSpinLock(&g_VBoxNetLwfGlobals.Lock);
             Log(("vboxNetFltOsInitInstance: found matching module, name=%s\n", pThis->szName));
             pThis->u.s.WinIf.hModuleCtx = pModuleCtx;
@@ -2347 +2349 @@
         }
     }
+    NdisReleaseSpinLock(&g_VBoxNetLwfGlobals.Lock);
     LogFlow(("<==vboxNetFltOsInitInstance: return VERR_INTNET_FLT_IF_NOT_FOUND\n"));
     return VERR_INTNET_FLT_IF_NOT_FOUND;