git: 429c706669e8 - stable/13 - sctp: improve path verification

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Wed, 01 Feb 2023 22:47:49 UTC
The branch stable/13 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=429c706669e887139aa64e7b573757865a40a2bc

commit 429c706669e887139aa64e7b573757865a40a2bc
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-14 06:05:03 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:47:23 +0000

    sctp: improve path verification
    
    When sending path confirmation heartbeats, do not take HB.interval
    into account when the path is still reachable.
    
    Thanks to Alexander Funke for finding the issue and suggesting a fix.
    
    (cherry picked from commit 9312ba239e05b035c965e5790f70fe71a4ed2e8c)
---
 sys/netinet/sctputil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 29d8c6a5e964..f2065beb2bb2 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2300,7 +2300,8 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 		} else {
 			to_ticks = UINT32_MAX;
 		}
-		if (((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) &&
+		if (!((net->dest_state & SCTP_ADDR_UNCONFIRMED) &&
+		    (net->dest_state & SCTP_ADDR_REACHABLE)) &&
 		    ((net->dest_state & SCTP_ADDR_PF) == 0)) {
 			if (net->heart_beat_delay < (UINT32_MAX - to_ticks)) {
 				to_ticks += net->heart_beat_delay;