Changeset 53380 in vbox for trunk

Timestamp:

Nov 24, 2014 2:28:53 AM (10 years ago)

Author:

vboxsync

Message:

NAT: allocate extra space for ICMP API internal use if reqest size is too small

File:

• trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c (modified) (4 diffs)

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

@@ -115 +115 @@
 {
     struct ip *ip = mtod(m, struct ip *);
-    int icmplen = ip->ip_len - hlen;
+    size_t reqsize;
     uint8_t ttl;
     size_t bufsize;
@@ -122 +122 @@
     IP_OPTION_INFORMATION opts;
     void *reqdata;
-    size_t reqsize;
     int status;
 
@@ -129 +128 @@
     --ttl;
 
-    bufsize = sizeof(ICMP_ECHO_REPLY) + icmplen;
+    reqsize = ip->ip_len - hlen - sizeof(struct icmp_echo);
+
+    bufsize = sizeof(ICMP_ECHO_REPLY);
+    if (reqsize < sizeof(IO_STATUS_BLOCK) + sizeof(struct icmp_echo))
+        bufsize += sizeof(IO_STATUS_BLOCK) + sizeof(struct icmp_echo);
+    else
+        bufsize += reqsize;
+    bufsize += 16; /* whatever that is; empirically at least XP needs it */
+    LogRel(("NAT: ping size=%d bufsize=%d\n", (int)reqsize, (int)bufsize));
+
     pong = RTMemAlloc(RT_OFFSETOF(struct pong, buf) + bufsize);
     if (RT_UNLIKELY(pong == NULL))
@@ -140 +148 @@
     AssertReturnVoid(pong->reqicmph.icmp_type == ICMP_ECHO);
 
-    reqsize = icmplen - sizeof(struct icmp_echo); /* just the payload */
     if (m->m_next == NULL)
     {