From owner-svn-src-stable-12@freebsd.org Sun Aug 23 22:13:58 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 78D6C3CCF6E; Sun, 23 Aug 2020 22:13:58 +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 4BZV062fwJz4dcr; Sun, 23 Aug 2020 22:13:58 +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 3EA1AE440; Sun, 23 Aug 2020 22:13:58 +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 07NMDwfd092020; Sun, 23 Aug 2020 22:13:58 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07NMDwMS092019; Sun, 23 Aug 2020 22:13:58 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <202008232213.07NMDwMS092019@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:13:58 +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: r364567 - 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: 364567 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:13:58 -0000 Author: tuexen Date: Sun Aug 23 22:13:57 2020 New Revision: 364567 URL: https://svnweb.freebsd.org/changeset/base/364567 Log: MFC r359300: Don't restore the vnet too early in error cases. 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:12:55 2020 (r364566) +++ stable/12/sys/netinet/sctputil.c Sun Aug 23 22:13:57 2020 (r364567) @@ -1669,10 +1669,10 @@ sctp_timeout_handler(void *t) (type != SCTP_TIMER_TYPE_SHUTDOWNGUARD) && (type != SCTP_TIMER_TYPE_ASOCKILL))) { SCTP_INP_DECR_REF(inp); - CURVNET_RESTORE(); SCTPDBG(SCTP_DEBUG_TIMER2, "Timer type = %d handler exiting due to closed socket\n", type); + CURVNET_RESTORE(); return; } } @@ -1684,10 +1684,10 @@ sctp_timeout_handler(void *t) if (inp) { SCTP_INP_DECR_REF(inp); } - CURVNET_RESTORE(); SCTPDBG(SCTP_DEBUG_TIMER2, "Timer type = %d handler exiting due to CLOSED association\n", type); + CURVNET_RESTORE(); return; } } @@ -1700,10 +1700,10 @@ sctp_timeout_handler(void *t) if (stcb) { atomic_add_int(&stcb->asoc.refcnt, -1); } - CURVNET_RESTORE(); SCTPDBG(SCTP_DEBUG_TIMER2, "Timer type = %d handler exiting due to not being active\n", type); + CURVNET_RESTORE(); return; } tmr->stopped_from = 0xa004; @@ -1718,10 +1718,10 @@ sctp_timeout_handler(void *t) if (inp) { SCTP_INP_DECR_REF(inp); } - CURVNET_RESTORE(); SCTPDBG(SCTP_DEBUG_TIMER2, "Timer type = %d handler exiting due to CLOSED association\n", type); + CURVNET_RESTORE(); return; } } else if (inp != NULL) {