Changeset 51904 in vbox for trunk/src

Timestamp:

Jul 7, 2014 2:09:10 PM (11 years ago)

Author:

vboxsync

Message:

NAT: Fix unsigned wraparound when calculating offered window. rcv_nxt
may "overtake" rcv_adv on successful window probe from guest.

File:

• trunk/src/VBox/Devices/Network/slirp/tcp_output.c (modified) (2 diffs)

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

@@ -234 +234 @@
          * TCP_MAXWIN << tp->rcv_scale.
          */
-        long adv = min(win,
-                       (long)TCP_MAXWIN << tp->rcv_scale) -
-                       (tp->rcv_adv - tp->rcv_nxt);
+        long adv = min(win, (long)TCP_MAXWIN << tp->rcv_scale);
+        if (SEQ_GT(tp->rcv_adv, tp->rcv_nxt))
+            adv -= tp->rcv_adv - tp->rcv_nxt;
 
         if (adv >= (long) (2 * tp->t_maxseg))
@@ -555 +555 @@
     if (win > (long)TCP_MAXWIN << tp->rcv_scale)
         win = (long)TCP_MAXWIN << tp->rcv_scale;
-    if (win < (long)(tp->rcv_adv - tp->rcv_nxt))
-        win = (long)(tp->rcv_adv - tp->rcv_nxt);
+    if (win < (long)(int32_t)(tp->rcv_adv - tp->rcv_nxt))
+        win = (long)(int32_t)(tp->rcv_adv - tp->rcv_nxt);
     ti->ti_win = RT_H2N_U16((u_int16_t) (win>>tp->rcv_scale));