Changeset 15842 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jan 7, 2009 4:41:48 PM (16 years ago)

Author:

vboxsync

Message:

SrvIntNetR0: Rewrote r41325 so it fixes the problem without leaking memory.

Location:

trunk/src/VBox/Devices/Network

Files:

• SrvIntNetR0.cpp (modified) (7 diffs)
• testcase/tstIntNetR0.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -547 +547 @@
  * by handle lookup/freeing.
  *
- * @returns false in case the pIf was deleted as a result of this call, false otherwise
+ * @returns true if destroyed, false if not.
  * @param   pIf                 The interface instance.
  * @param   pSession            The current session.
@@ -555 +555 @@
     int rc = SUPR0ObjRelease(pIf->pvObj, pSession);
     AssertRC(rc);
-    if(!pIf->pvObj)
-    {
-        RTMemFree(pIf);
-        return false;
-    }
-    return true;
+    return rc == VINF_OBJECT_DESTROYED;
 }
 
@@ -3053 +3048 @@
         if (!pIf->fDestroying)
         {
-            if(!intnetR0IfRelease(pIf, pSession))
+            if (!intnetR0IfRelease(pIf, pSession))
                 rc = VERR_SEM_DESTROYED;
         }
@@ -3113 +3108 @@
     RTSemEventSignal(pIf->Event);
 
+    void *pvObj = pIf->pvObj;
     intnetR0IfRelease(pIf, pSession); /* (RTHandleTableFreeWithCtx) */
 
-    intnetR0IfRelease(pIf, pSession);
-
-    int rc = VINF_SUCCESS;
+    int rc = SUPR0ObjRelease(pvObj, pSession);
     LogFlow(("INTNETR0IfClose: returns %Rrc\n", rc));
     return rc;
@@ -3172 +3166 @@
     }
 
-     /*
+    /*
      * If we've got a network deactivate and unlink ourselves from it.
      * Because of cleanup order we might be an orphan now.
@@ -3265 +3259 @@
      */
     pIf->pvObj = NULL;
-    /*
-     * we are freeing it in
-     * intnetR0IfRelease
-     * RTMemFree(pIf);
-     */
+    RTMemFree(pIf);
 }
 
@@ -3396 +3386 @@
                     }
 
-                    intnetR0IfRelease(pIf, pSession);
+                    SUPR0ObjRelease(pIf->pvObj, pSession);
                     LogFlow(("intnetR0NetworkCreateIf: returns %Rrc\n", rc));
                     return rc;

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -161 +161 @@
         pRef->pfnDestructor(pRef, pRef->pvUser1, pRef->pvUser2);
         RTMemFree(pRef);
+        return VINF_OBJECT_DESTROYED;
     }
     return VINF_SUCCESS;