Changeset 28502 in vbox

Timestamp:

Apr 20, 2010 7:16:46 AM (15 years ago)

Author:

vboxsync

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

60298

Message:

NAT: correct handling end of zone's resources.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• misc.c (modified) (2 diffs)
• slirp.c (modified) (1 diff)
• socket.c (modified) (2 diffs)

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

@@ -140 +140 @@
     uint8_t *sub_area;
     void *ret = NULL;
+    int rc;
 
     RTCritSectEnter(&zone->csZone);
@@ -146 +147 @@
         if (!LIST_EMPTY(&zone->free_items))
         {
-            zone->cur_items++;
             it = LIST_FIRST(&zone->free_items);
-            LIST_REMOVE(it, list);
-            LIST_INSERT_HEAD(&zone->used_items, it, list);
+            rc = 0;
             if (zone->pfInit)
-                zone->pfInit(zone->pData, (void *)&it[1], zone->size, M_DONTWAIT);
-            ret = (void *)&it[1];
+                rc = zone->pfInit(zone->pData, (void *)&it[1], zone->size, M_DONTWAIT);
+            if (rc == 0)
+            {
+                zone->cur_items++;
+                LIST_REMOVE(it, list);
+                LIST_INSERT_HEAD(&zone->used_items, it, list);
+                ret = (void *)&it[1];
+            }
+            else
+            {
+                ret = NULL;
+            }
             break;
         }

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

@@ -1463 +1463 @@
 #else
             mr = m_getcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR);
+            if (mr == NULL)
+                return;
             reh = mtod(mr, struct ethhdr *);
             mr->m_data += ETH_HLEN;

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

@@ -684 +684 @@
 
         m = m_getjcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR, size);
+        if (m == NULL)
+            return;
         m->m_data += ETH_HLEN;
         m->m_pkthdr.header = mtod(m, void *);
@@ -1309 +1311 @@
 
                 m = m_getjcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR, size);
+                if (m == NULL)
+                    return;
 # endif
                 m->m_len = 0;