git: 0a62368c6a53 - stable/10 - MFC 9febbc454190: Fix for natd(8) sending wrong sequence number after TCP retransmission, terminating a TCP connection.

[Hans Petter Selasky]

The branch stable/10 has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=0a62368c6a53054fcc255583cf6308f85a1533d2

commit 0a62368c6a53054fcc255583cf6308f85a1533d2
Author:     Hans Petter Selasky <hselasky at FreeBSD.org>
AuthorDate: 2021-02-22 10:58:46 +0000
Commit:     Hans Petter Selasky <hselasky at FreeBSD.org>
CommitDate: 2021-03-03 09:57:29 +0000

    MFC 9febbc454190:
    Fix for natd(8) sending wrong sequence number after TCP retransmission,
    terminating a TCP connection.
    
    If a TCP packet must be retransmitted and the data length has changed in the
    retransmitted packet, due to the internal workings of TCP, typically when ACK
    packets are lost, then there is a 30% chance that the logic in GetDeltaSeqOut()
    will find the correct length, which is the last length received.
    
    This can be explained as follows:
    
    If a "227 Entering Passive Mode" packet must be retransmittet and the length
    changes from 51 to 50 bytes, for example, then we have three cases for the
    list scan in GetDeltaSeqOut(), depending on how many prior packets were
    received modulus N_LINK_TCP_DATA=3:
    
      case 1:  index 0:   original packet        51
               index 1:   retransmitted packet   50
               index 2:   not relevant
    
      case 2:  index 0:   not relevant
               index 1:   original packet        51
               index 2:   retransmitted packet   50
    
      case 3:  index 0:   retransmitted packet   50
               index 1:   not relevant
               index 2:   original packet        51
    
    This patch simply changes the searching order for TCP packets, always starting
    at the last received packet instead of any received packet, in
    GetDeltaAckIn() and GetDeltaSeqOut().
    
    Else no functional changes.
    
    Discussed with: rscheff@
    Submitted by:   Andreas Longwitz <longwitz at incore.de>
    PR:             230755
    Sponsored by:   Mellanox Technologies // NVIDIA Networking
    
    (cherry picked from commit 9febbc4541903bb8e6b0f1c84988c98b2f7c96ef)
---
 sys/netinet/libalias/alias_db.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c
index 052e04563fa1..a0144d3ef9f3 100644
--- a/sys/netinet/libalias/alias_db.c
+++ b/sys/netinet/libalias/alias_db.c
@@ -1992,14 +1992,18 @@ TCP packet.  To do this, a circular list of ACK numbers where the TCP
 packet size was altered is searched.
 */
 
-	int i;
+	int i, j;
 	int delta, ack_diff_min;
 
 	delta = 0;
 	ack_diff_min = -1;
-	for (i = 0; i < N_LINK_TCP_DATA; i++) {
+	i = lnk->data.tcp->state.index;
+	for (j = 0; j < N_LINK_TCP_DATA; j++) {
 		struct ack_data_record x;
 
+		if (i == 0)
+			i = N_LINK_TCP_DATA;
+		i--;
 		x = lnk->data.tcp->ack[i];
 		if (x.active == 1) {
 			int ack_diff;
@@ -2031,14 +2035,18 @@ TCP packet.  To do this, a circular list of ACK numbers where the TCP
 packet size was altered is searched.
 */
 
-	int i;
+	int i, j;
 	int delta, seq_diff_min;
 
 	delta = 0;
 	seq_diff_min = -1;
-	for (i = 0; i < N_LINK_TCP_DATA; i++) {
+	i = lnk->data.tcp->state.index;
+	for (j = 0; j < N_LINK_TCP_DATA; j++) {
 		struct ack_data_record x;
 
+		if (i == 0)
+			i = N_LINK_TCP_DATA;
+		i--;
 		x = lnk->data.tcp->ack[i];
 		if (x.active == 1) {
 			int seq_diff;