From owner-svn-src-stable-12@freebsd.org Sun Aug 23 22:19:40 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 31B183CD79F; Sun, 23 Aug 2020 22:19:40 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BZV6h0YFKz4f7S; Sun, 23 Aug 2020 22:19:40 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6059E71E; Sun, 23 Aug 2020 22:19:39 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07NMJduT092595; Sun, 23 Aug 2020 22:19:39 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07NMJdVd092594; Sun, 23 Aug 2020 22:19:39 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <202008232219.07NMJdVd092594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 23 Aug 2020 22:19:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364570 - stable/12/sys/netinet X-SVN-Group: stable-12 X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: stable/12/sys/netinet X-SVN-Commit-Revision: 364570 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Aug 2020 22:19:40 -0000 Author: tuexen Date: Sun Aug 23 22:19:39 2020 New Revision: 364570 URL: https://svnweb.freebsd.org/changeset/base/364570 Log: MFC r359306: Remove an optimization, which was incorrect a couple of times and therefore doesn't seem worth to be there. In this case COOKIE where not retransmitted anymore, when the socket was already closed. 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 Sun Aug 23 22:17:29 2020 (r364569) +++ stable/12/sys/netinet/sctputil.c Sun Aug 23 22:19:39 2020 (r364570) @@ -1655,28 +1655,10 @@ sctp_timeout_handler(void *t) KASSERT(tmr->self == tmr, ("tmr->self corrupted")); KASSERT(SCTP_IS_TIMER_TYPE_VALID(tmr->type), ("Invalid timer type %d", tmr->type)); type = tmr->type; - tmr->stopped_from = 0xa001; if (inp) { SCTP_INP_INCR_REF(inp); - if ((inp->sctp_socket == NULL) && - ((type != SCTP_TIMER_TYPE_INPKILL) && - (type != SCTP_TIMER_TYPE_INIT) && - (type != SCTP_TIMER_TYPE_SEND) && - (type != SCTP_TIMER_TYPE_RECV) && - (type != SCTP_TIMER_TYPE_HEARTBEAT) && - (type != SCTP_TIMER_TYPE_SHUTDOWN) && - (type != SCTP_TIMER_TYPE_SHUTDOWNACK) && - (type != SCTP_TIMER_TYPE_SHUTDOWNGUARD) && - (type != SCTP_TIMER_TYPE_ASOCKILL))) { - SCTP_INP_DECR_REF(inp); - SCTPDBG(SCTP_DEBUG_TIMER2, - "Timer type %d handler exiting due to closed socket.\n", - type); - CURVNET_RESTORE(); - return; - } } - tmr->stopped_from = 0xa002; + tmr->stopped_from = 0xa001; if (stcb) { atomic_add_int(&stcb->asoc.refcnt, 1); if (stcb->asoc.state == 0) { @@ -1691,7 +1673,7 @@ sctp_timeout_handler(void *t) return; } } - tmr->stopped_from = 0xa003; + tmr->stopped_from = 0xa002; SCTPDBG(SCTP_DEBUG_TIMER2, "Timer type %d goes off.\n", type); if (!SCTP_OS_TIMER_ACTIVE(&tmr->timer)) { if (inp) { @@ -1706,8 +1688,8 @@ sctp_timeout_handler(void *t) CURVNET_RESTORE(); return; } - tmr->stopped_from = 0xa004; + tmr->stopped_from = 0xa003; if (stcb) { SCTP_TCB_LOCK(stcb); atomic_add_int(&stcb->asoc.refcnt, -1);