svn commit: r359288 - head/sys/netinet

Michael Tuexen tuexen at FreeBSD.org
Wed Mar 25 01:32:00 UTC 2020


Author: tuexen
Date: Tue Mar 24 23:04:07 2020
New Revision: 359288
URL: https://svnweb.freebsd.org/changeset/base/359288

Log:
  Only call panic when building with INVARIANTS.
  
  MFC after:		1 week

Modified:
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c	Tue Mar 24 22:44:36 2020	(r359287)
+++ head/sys/netinet/sctputil.c	Tue Mar 24 23:04:07 2020	(r359288)
@@ -2015,7 +2015,11 @@ sctp_timeout_handler(void *t)
 		sctp_delete_prim_timer(inp, stcb);
 		break;
 	default:
+#ifdef INVARIANTS
 		panic("Unknown timer type %d", type);
+#else
+		goto get_out;
+#endif
 	}
 #ifdef SCTP_AUDITING_ENABLED
 	sctp_audit_log(0xF1, (uint8_t)type);
@@ -2434,7 +2438,11 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
 		to_ticks = MSEC_TO_TICKS(stcb->asoc.initial_rto);
 		break;
 	default:
+#ifdef INVARIANTS
 		panic("Unknown timer type %d", t_type);
+#else
+		return;
+#endif
 	}
 	KASSERT(tmr != NULL, ("tmr is NULL for timer type %d", t_type));
 	KASSERT(to_ticks > 0, ("to_ticks == 0 for timer type %d", t_type));
@@ -2715,7 +2723,11 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, st
 		tmr = &stcb->asoc.delete_prim_timer;
 		break;
 	default:
+#ifdef INVARIANTS
 		panic("Unknown timer type %d", t_type);
+#else
+		return;
+#endif
 	}
 	KASSERT(tmr != NULL, ("tmr is NULL for timer type %d", t_type));
 	if ((tmr->type != SCTP_TIMER_TYPE_NONE) &&


More information about the svn-src-head mailing list