Changeset 26596 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Feb 17, 2010 4:29:46 AM (15 years ago)

Author:

vboxsync

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

57788

Message:

NAT: leak in BSD mbuf sync (#3993)

File:

• trunk/src/VBox/Devices/Network/slirp/misc.c (modified) (3 diffs)

trunk/src/VBox/Devices/Network/slirp/misc.c

@@ -152 +152 @@
     struct item *it;
     RTCritSectEnter(&zone->csZone);
-    if (   (zone->max_items != 0 && zone->cur_items >= zone->max_items)
-        || (zone->max_items == 0 && !LIST_EMPTY(&zone->free_items))
-        )
+    if (!LIST_EMPTY(&zone->free_items))
     {
         /*
@@ -184 +182 @@
     zone->cur_items++;
     it->zone = zone;
+    if (zone->cur_items >= zone->max_items)
+        LogRel(("NAT: zone(%s) has reached it maximum\n", zone->name));
 
     allocated:
@@ -369 +369 @@
 static void zone_destroy(uma_zone_t zone)
 {
+    struct item *it;
+    RTCritSectEnter(&zone->csZone);
+    LogRel(("NAT: zone(nm:%s, used:%d)\n", zone->name, zone->cur_items));
+    /* freeing */
+    while (!LIST_EMPTY(&zone->free_items))
+    {
+        it = LIST_FIRST(&zone->free_items);
+        LIST_REMOVE(it, list);
+        RTMemFree(it);
+    }
+    while (!LIST_EMPTY(&zone->used_items))
+    {
+        it = LIST_FIRST(&zone->used_items);
+        LIST_REMOVE(it, list);
+        RTMemFree(it);
+    }
+    RTCritSectLeave(&zone->csZone);
     RTCritSectDelete(&zone->csZone);
     RTMemFree(zone);