tcp: avoid consuming trailing bytes 88/29788/2
authorFlorin Coras <fcoras@cisco.com>
Thu, 5 Nov 2020 21:39:48 +0000 (13:39 -0800)
committerFlorin Coras <fcoras@cisco.com>
Thu, 5 Nov 2020 21:58:52 +0000 (13:58 -0800)
Thanks to Shaligram Prakash <Shaligram.Prakash@enea.com> for reporting.

Type: fix

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

src/vnet/tcp/tcp_input.c

index ce1c9d5..305e2d3 100644 (file)
@@ -1298,6 +1298,10 @@ tcp_segment_rcv (tcp_worker_ctx_t * wrk, tcp_connection_t * tc,
   ASSERT (n_data_bytes);
   tc->data_segs_in += 1;
 
+  /* Make sure we don't consume trailing bytes */
+  if (PREDICT_FALSE (b->current_length != n_data_bytes))
+    b->current_length = n_data_bytes;
+
   /* Handle out-of-order data */
   if (PREDICT_FALSE (vnet_buffer (b)->tcp.seq_number != tc->rcv_nxt))
     {