Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jun 2011 07:07:18 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r223326 - head/sys/netinet
Message-ID:  <201106200707.p5K77Isx028438@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bz
Date: Mon Jun 20 07:07:18 2011
New Revision: 223326
URL: http://svn.freebsd.org/changeset/base/223326

Log:
  Fix a KASSERT from r212803 to check the correct length also in case of
  IPsec being compiled in and used.  Improve reporting by adding the length
  fields to the panic message, so that we would have some immediate debugging
  hints.
  
  Discussed with:	jhb

Modified:
  head/sys/netinet/tcp_output.c

Modified: head/sys/netinet/tcp_output.c
==============================================================================
--- head/sys/netinet/tcp_output.c	Mon Jun 20 03:25:09 2011	(r223325)
+++ head/sys/netinet/tcp_output.c	Mon Jun 20 07:07:18 2011	(r223326)
@@ -1102,8 +1102,15 @@ send:
 		m->m_pkthdr.tso_segsz = tp->t_maxopd - optlen;
 	}
 
+#ifdef IPSEC
+	KASSERT(len + hdrlen + ipoptlen - ipsec_optlen == m_length(m, NULL),
+	    ("%s: mbuf chain shorter than expected: %ld + %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", __func__));
+	    ("%s: mbuf chain shorter than expected: %ld + %u + %u != %u",
+	    __func__, len, hdrlen, ipoptlen, m_length(m, NULL)));
+#endif
 
 	/*
 	 * In transmit state, time the transmission and arrange for



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106200707.p5K77Isx028438>