Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Aug 2020 08:11:47 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r364613 - stable/12/sys/netinet
Message-ID:  <202008240811.07O8Bl8P060655@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Mon Aug 24 08:11:47 2020
New Revision: 364613
URL: https://svnweb.freebsd.org/changeset/base/364613

Log:
  MFC r362277:
  Allow the self reference to be NULL in case the timer was stopped.

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

Modified: stable/12/sys/netinet/sctputil.c
==============================================================================
--- stable/12/sys/netinet/sctputil.c	Mon Aug 24 08:10:27 2020	(r364612)
+++ stable/12/sys/netinet/sctputil.c	Mon Aug 24 08:11:47 2020	(r364613)
@@ -1726,7 +1726,7 @@ sctp_timeout_handler(void *t)
 #endif
 
 	/* sanity checks... */
-	KASSERT(tmr->self == tmr,
+	KASSERT(tmr->self == NULL || tmr->self == tmr,
 	    ("sctp_timeout_handler: tmr->self corrupted"));
 	KASSERT(SCTP_IS_TIMER_TYPE_VALID(tmr->type),
 	    ("sctp_timeout_handler: invalid timer type %d", tmr->type));



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