svn commit: r347109 - stable/12/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat May  4 11:21:41 2019
New Revision: 347109
URL: https://svnweb.freebsd.org/changeset/base/347109

Log:
  MFC r345441:
  Fix a KASSERT() in tcp_output().
  
  When checking the length of the headers at this point, the IP level
  options have not been added to the mbuf chain.
  So don't take them into account.
  
  Reviewed by:		rrs@
  Sponsored by:		Netflix, Inc.

Modified:
  stable/12/sys/netinet/tcp_output.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/tcp_output.c
==============================================================================
--- stable/12/sys/netinet/tcp_output.c	Sat May  4 11:18:39 2019	(r347108)
+++ stable/12/sys/netinet/tcp_output.c	Sat May  4 11:21:41 2019	(r347109)
@@ -1283,15 +1283,9 @@ send:
 		m->m_pkthdr.tso_segsz = tp->t_maxseg - optlen;
 	}
 
-#if defined(IPSEC) || defined(IPSEC_SUPPORT)
-	KASSERT(len + hdrlen + ipoptlen - ipsec_optlen == m_length(m, NULL),
-	    ("%s: mbuf chain shorter than expected: %d + %u + %u - %u != %u",
-	    __func__, len, hdrlen, ipoptlen, ipsec_optlen, m_length(m, NULL)));
-#else
-	KASSERT(len + hdrlen + ipoptlen == m_length(m, NULL),
-	    ("%s: mbuf chain shorter than expected: %d + %u + %u != %u",
-	    __func__, len, hdrlen, ipoptlen, m_length(m, NULL)));
-#endif
+	KASSERT(len + hdrlen == m_length(m, NULL),
+	    ("%s: mbuf chain shorter than expected: %d + %u != %u",
+	    __func__, len, hdrlen, m_length(m, NULL)));
 
 #ifdef TCP_HHOOK
 	/* Run HHOOK_TCP_ESTABLISHED_OUT helper hooks. */