datapath-windows: Fix bug in OvsTcpGetWscale().

The userspace conntrack had a bug in tcp_wscale_get(), where the length
of an option would be read from the third octet of the option TLV
instead of the second.  This could cause an incorrect wscale value to
be returned, and it would at least impact performance.

Also use 'int' instead of 'unsigned' for 'len', since the value can be
negative.

CC: Sairam Venugopal <vsairam@vmware.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/datapath-windows/ovsext/Conntrack-tcp.c b/datapath-windows/ovsext/Conntrack-tcp.c
index ebf0c9555..24f5e7c80 100644
--- a/datapath-windows/ovsext/Conntrack-tcp.c
+++ b/datapath-windows/ovsext/Conntrack-tcp.c
@@ -159,7 +159,7 @@ OvsConntrackValidateTcpFlags(const TCPHdr *tcp)
 static __inline uint8_t
 OvsTcpGetWscale(const TCPHdr *tcp)
 {
-    unsigned len = tcp->doff * 4 - sizeof *tcp;
+    int len = tcp->doff * 4 - sizeof *tcp;
     const uint8_t *opt = (const uint8_t *)(tcp + 1);
     uint8_t wscale = 0;
     uint8_t optlen;
@@ -178,7 +178,7 @@ OvsTcpGetWscale(const TCPHdr *tcp)
             wscale |= CT_WSCALE_FLAG;
             /* fall through */
         default:
-            optlen = opt[2];
+            optlen = opt[1];
             if (optlen < 2) {
                 optlen = 2;
             }
@@ -522,4 +522,4 @@ OvsConntrackCreateTcpEntry(const TCPHdr *tcp,
     OvsConntrackUpdateExpiration(newconn, now, CT_ENTRY_TIMEOUT);
 
     return &newconn->up;
-}
\ No newline at end of file
+}