git: c4804b6b0b94 - main - Unbreak TFO, that was broken with 8d5719aa74f. These two assignments are unneccessary and used to be there before TFO as an invariant. With TFO and after 8d5719aa74f the "so" value is still needed.

[Gleb Smirnoff]

The branch main has been updated by glebius:

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

commit c4804b6b0b94f1c7228b62114bf294d63f6db2b7
Author:     Gleb Smirnoff <glebius at FreeBSD.org>
AuthorDate: 2021-06-22 23:03:44 +0000
Commit:     Gleb Smirnoff <glebius at FreeBSD.org>
CommitDate: 2021-06-22 23:03:44 +0000

    Unbreak TFO, that was broken with 8d5719aa74f.  These two assignments
    are unneccessary and used to be there before TFO as an invariant.  With
    TFO and after 8d5719aa74f the "so" value is still needed.
    
    Reported & tested by:   tuexen
    Fixes:  8d5719aa74f1d1441ee5ee365d45d53f934e81d6
---
 sys/netinet/tcp_syncache.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 35d9c091ab96..4be888f22a37 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -1491,10 +1491,6 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
 		tfo_pending = tp->t_tfo_pending;
 	}
 
-	/* By the time we drop the lock these should no longer be used. */
-	so = NULL;
-	tp = NULL;
-
 #ifdef MAC
 	if (mac_syncache_init(&maclabel) != 0) {
 		INP_RUNLOCK(inp);