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

Timestamp:

Sep 11, 2013 5:11:45 PM (11 years ago)

Author:

vboxsync

Message:

Check for PXREMAP_FAILED now that it can actually happen.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• fwudp.c (modified) (2 diffs)
• pxtcp.c (modified) (1 diff)

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

@@ -274 +274 @@
     struct pbuf *p;
     ssize_t nread;
+    int status;
     err_t error;
 
@@ -309 +310 @@
 
 
-    fwany_ipX_addr_set_src(&dgram->src_addr, (struct sockaddr *)&ss);
+    status = fwany_ipX_addr_set_src(&dgram->src_addr, (struct sockaddr *)&ss);
+    if (status == PXREMAP_FAILED) {
+        return POLLIN;
+    }
+
     if (ss.ss_family == AF_INET) {
         const struct sockaddr_in *peer4 = (const struct sockaddr_in *)&ss;

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

@@ -1221 +1221 @@
     LWIP_ASSERT1(ss.ss_family == fwspec->sdom);
 
-    fwany_ipX_addr_set_src(&src_addr, (const struct sockaddr *)&ss);
+    status = fwany_ipX_addr_set_src(&src_addr, (const struct sockaddr *)&ss);
+    if (status == PXREMAP_FAILED) {
+        goto reset;
+    }
+
     if (ss.ss_family == PF_INET) {
         const struct sockaddr_in *peer4 = (const struct sockaddr_in *)&ss;