Changeset 88525 in vbox

Timestamp:

Apr 15, 2021 11:40:05 AM (4 years ago)

Author:

vboxsync

Message:

NAT: Handle IP options in the ping echo request. bugref:9986.

File:

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

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

@@ -46 +46 @@
     TAILQ_ENTRY(pong) queue_entry;
 
-    struct ip reqiph;
+    union {
+        struct ip ip;
+        uint8_t au[60];
+    } reqiph;
     struct icmp_echo reqicmph;
 
@@ -146 +149 @@
     AssertReturnVoid(ttl > 0);
 
-    reqsize = ip->ip_len - hlen - sizeof(struct icmp_echo);
+    size_t hdrsize = hlen + sizeof(struct icmp_echo);
+    reqsize = ip->ip_len - hdrsize;
 
     bufsize = sizeof(ICMP_ECHO_REPLY);
@@ -172 +176 @@
     {
         /* already in single contiguous buffer */
-        reqdata = mtod(m, char *) + sizeof(struct ip) + sizeof(struct icmp_echo);
+        reqdata = mtod(m, char *) + hdrsize;
     }
     else
@@ -178 +182 @@
         /* use reply buffer as temporary storage */
         reqdata = pong->buf;
-        m_copydata(m, sizeof(struct ip) + sizeof(struct icmp_echo),
-                   (int)reqsize, reqdata);
+        m_copydata(m, (int)hdrsize, (int)reqsize, reqdata);
     }
 
@@ -398 +401 @@
         ip->ip_p = IPPROTO_ICMP;
         ip->ip_src.s_addr = reply->Address;
-        ip->ip_dst = pong->reqiph.ip_src;
+        ip->ip_dst = pong->reqiph.ip.ip_src;
 
         icmp->icmp_type = ICMP_ECHOREPLY;
@@ -479 +482 @@
     Log2(("NAT: ping error type %d/code %d\n", type, code));
 
-    reqsize = sizeof(pong->reqiph) + sizeof(pong->reqicmph);
+    size_t reqhlen = pong->reqiph.ip.ip_hl << 2;
+    reqsize = reqhlen + sizeof(pong->reqicmph);
 
     m = icmpwin_get_mbuf(pData, reqsize);
@@ -494 +498 @@
     ip->ip_p = IPPROTO_ICMP;
     ip->ip_src.s_addr = 0;      /* NB */
-    ip->ip_dst = pong->reqiph.ip_src;
+    ip->ip_dst = pong->reqiph.ip.ip_src;
 
     icmp->icmp_type = type;
@@ -502 +506 @@
     icmp->icmp_echo_seq = 0;
 
-    m_append(pData, m, sizeof(pong->reqiph), (caddr_t)&pong->reqiph);
+    /* payload: the IP and ICMP headers of the original request */
+    m_append(pData, m, (int)reqhlen, (caddr_t)&pong->reqiph);
     m_append(pData, m, sizeof(pong->reqicmph), (caddr_t)&pong->reqicmph);