commit 3b9540966f877ae67d374cab334c31bd6e3f8c8b
author Florin Coras <fcoras@cisco.com> Mon May 25 19:15:56 2020 +0000
committer Florin Coras <fcoras@cisco.com> Mon May 25 19:36:59 2020 +0000
tree 0ad6a75076ac2e2ea0223ef6469b060dc51084b2
parent f5db3711b28db4e364ac01be8b124dd24d573782

tcp: fix sack block validation on wrap

Type: fix
Fixes: 487507f

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ia9813ae09d14111dc8edac0fa6ab082e13ab6e2e

src/plugins/unittest/tcp_test.c

diff --git a/src/plugins/unittest/tcp_test.c b/src/plugins/unittest/tcp_test.c
index 535f055..b98d360 100644
--- a/src/plugins/unittest/tcp_test.c
+++ b/src/plugins/unittest/tcp_test.c
@@ -637,6 +637,32 @@
   TCP_TEST ((sb->rxt_sacked == 300), "last rxt sacked bytes %d",
 	    sb->rxt_sacked);
 
+  /*
+   * Restart
+   */
+  scoreboard_clear (sb);
+  vec_reset_length (tc->rcv_opts.sacks);
+
+  /*
+   * Broken sacks:
+   * block.start > snd_nxt
+   * && block.start < blk.end
+   * && block.end <= snd_nxt
+   */
+  tc->flags = 0;
+  block.start = 2147483647;
+  block.end = 4294967295;
+  vec_add1 (tc->rcv_opts.sacks, block);
+  tc->snd_una = tc->snd_nxt = 1969067947;
+
+  tcp_rcv_sacks (tc, tc->snd_una);
+
+  /*
+   * Clear
+   */
+  scoreboard_clear (sb);
+  vec_reset_length (tc->rcv_opts.sacks);
+
   return 0;
 }
 

src/vnet/tcp/tcp_sack.c

diff --git a/src/vnet/tcp/tcp_sack.c b/src/vnet/tcp/tcp_sack.c
index 589c7f3..b9e1166 100644
--- a/src/vnet/tcp/tcp_sack.c
+++ b/src/vnet/tcp/tcp_sack.c
@@ -326,7 +326,9 @@
     {
       if (seq_lt (blk->start, blk->end)
 	  && seq_gt (blk->start, tc->snd_una)
-	  && seq_gt (blk->start, ack) && seq_leq (blk->end, tc->snd_nxt))
+	  && seq_gt (blk->start, ack)
+	  && seq_lt (blk->start, tc->snd_nxt)
+	  && seq_leq (blk->end, tc->snd_nxt))
 	{
 	  blk++;
 	  continue;