Changeset 48437 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Sep 11, 2013 5:09:50 PM (11 years ago)

Author:

vboxsync

Message:

sys_mbox_tryfetch() returns timeout, not error code. Real tryfetch
returns only 0 or SYS_MBOX_EMPTY, so this code worked ok in standalone
mode since ERR_OK is also 0. In VBox tryfetch is faked with a fetch
with timeout of 1, so successful fetch may return non-zero value,
causing buggy caller to think tryfetch failed and leak memory.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• fwtcp.c (modified) (2 diffs)
• pxudp.c (modified) (2 diffs)

trunk/src/VBox/NetworkServices/NAT/fwtcp.c

@@ -308 +308 @@
     struct fwtcp *fwtcp = (struct fwtcp *)arg;
     struct pxtcp *pxtcp;
-    err_t error;
+    u32_t timo;
 
     if (!sys_mbox_valid(&fwtcp->connmbox)) {
@@ -315 +315 @@
 
     pxtcp = NULL;
-    error = sys_mbox_tryfetch(&fwtcp->connmbox, (void **)&pxtcp);
-    if (error != ERR_OK) {
+    timo = sys_mbox_tryfetch(&fwtcp->connmbox, (void **)&pxtcp);
+    if (timo == SYS_MBOX_EMPTY) {
         return;
     }

trunk/src/VBox/NetworkServices/NAT/pxudp.c

@@ -627 +627 @@
 {
     struct pbuf *p;
+    u32_t timo;
     err_t error;
 
@@ -633 +634 @@
     }
 
-    error = sys_mbox_tryfetch(&pxudp->inmbox, (void **)&p);
-    if (error != ERR_OK) {
+    timo = sys_mbox_tryfetch(&pxudp->inmbox, (void **)&p);
+    if (timo == SYS_MBOX_EMPTY) {
         return;
     }