git: 868868f14efc - main - sctp: improve stopping of timers

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Tue, 19 Apr 2022 19:31:27 UTC
The branch main has been updated by tuexen:

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

commit 868868f14efcd7e127dae6e87550357c6cdb9c6d
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-19 19:29:41 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2022-04-19 19:29:41 +0000

    sctp: improve stopping of timers
    
    Reported by:    syzbot+c9c70062320aaad19de7@syzkaller.appspotmail.com
    MFC after:      3 days
---
 sys/netinet/sctputil.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 8c96a832827a..49a8abbc9ccf 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2869,20 +2869,23 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 		 * counts that were incremented in sctp_timer_start().
 		 */
 		if (tmr->ep != NULL) {
-			SCTP_INP_DECR_REF(inp);
 			tmr->ep = NULL;
+			SCTP_INP_DECR_REF(inp);
 		}
 		if (tmr->tcb != NULL) {
-			atomic_subtract_int(&stcb->asoc.refcnt, 1);
 			tmr->tcb = NULL;
+			atomic_subtract_int(&stcb->asoc.refcnt, 1);
 		}
 		if (tmr->net != NULL) {
+			struct sctp_nets *tmr_net;
+
 			/*
 			 * Can't use net, since it doesn't work for
 			 * SCTP_TIMER_TYPE_ASCONF.
 			 */
-			sctp_free_remote_addr((struct sctp_nets *)tmr->net);
+			tmr_net = tmr->net;
 			tmr->net = NULL;
+			sctp_free_remote_addr((struct sctp_nets *)tmr_net);
 		}
 	} else {
 		SCTPDBG(SCTP_DEBUG_TIMER2,