From nobody Wed Feb 01 22:30:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P6c7j5y54z3cCbL; Wed, 1 Feb 2023 22:30:41 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P6c7j5Wjsz4HgY; Wed, 1 Feb 2023 22:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675290641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ks+GUyKIbDHKELf99V/ennOcV5zja4kUvel1OIu5MZk=; b=nnAQobokiKePqItYyLfURgGJHAQ0G55KiqmbJ0oSZUAoMCplgxcxrm/LOyRiERm5HJVD/K 15VTVcP55DFBifVulnzmxVxpxkjlSfO0D/IswX2Xv11t+Dd3ROkD+H50tfCNn3wyeTgDOd R/NPlvEJ4u1wHwXM5J47zVBBmygmlAZOiJSxkFuLd5CWD+nK0K5SZ60RJq3VZT00YtQVut 82+w5Fjw7b5jDQoEAax8Jv7fjttfbBd+1UYdQvXAzWxmzlIjOJKQjd6ulgVQk45y0B/Sq+ IB8xvZf30hTJ6J5vATLVKEttrr/p6nYsjhSa/SAonAoXJN31IvcJfsqw+vZQYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675290641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ks+GUyKIbDHKELf99V/ennOcV5zja4kUvel1OIu5MZk=; b=PSE3BTc3rrHm1bDmfZH0Hu8iUnNZhS8GJAbtNKZlDZk3UBcAcHZEN49gZB5J7ky195LtKS CCyWqFEgYJuMNw4OH463JBi79KUmsKF64gVLvJep2InjBuIdkOOprpyQcRdCXJ8pUEfOHa DArKgFwpOOZtOUV1n8MhOE3EdUtusSGsBfN4njAv+m8ETXSmAEHJlI/MFRKLXgB452TpF2 PoW6Bpxb7LNlfPTxozP3g4NRDYkOFjrhrZ0rN4kgyaXYgO1G5ojpQ809ci1T3TC2xPN/JE IgXBGw7gDBzv10CKeiB+Me6pznkT89m8Jwy1aVemzEPVeIveHgChP8wGXX/52Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290641; a=rsa-sha256; cv=none; b=wlM5YelOuX8P0tMu+rSLgy8hJ7fJXluKnjA3joqJM48AeqNuj2aOXfq+CGRNiF2RYbPxE7 OuCXIrVJ0/glpzUP0AHUBaD1ShxbYvg6Xv65mOgmLFmV8GX6aMNTTY2U89KofLNNSJBVD9 al48iOcxJhTmrVv6DUXp9J/8LP/bhBsdXagzhKxarigv8ns1qG6LVMFFmeiNgxK9NHkAHN bq3fX0m05MbmQqy3vsRv6sQhPEL9tznap6JiZfduxnPuIbBLzIXQ2ADyCCIdV4tHR1EkZ0 rEA7ML/skTMhwE8WzeMjx+0gaTCVlsZkoodlhAqDJkIwnl3+hQSXZIou4ACW/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P6c7j4czHzWFF; Wed, 1 Feb 2023 22:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 311MUf4g082230; Wed, 1 Feb 2023 22:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MUfMQ082229; Wed, 1 Feb 2023 22:30:41 GMT (envelope-from git) Date: Wed, 1 Feb 2023 22:30:41 GMT Message-Id: <202302012230.311MUfMQ082229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 108d740adff2 - stable/13 - sctp: cleanup, no functional change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 108d740adff29f694a023e427966454a7211f270 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=108d740adff29f694a023e427966454a7211f270 commit 108d740adff29f694a023e427966454a7211f270 Author: Michael Tuexen AuthorDate: 2022-04-02 21:02:16 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 22:30:21 +0000 sctp: cleanup, no functional change (cherry picked from commit b30b7a140c527c023f97083c256715ea86d4b6f4) --- sys/netinet/sctp_output.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index d0cebba4335b..3458da7e0578 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -13358,21 +13358,7 @@ skip_preblock: error = be.error; } } - if (error != 0) { - SOCKBUF_UNLOCK(&so->so_snd); - SCTP_TCB_LOCK(stcb); - hold_tcblock = true; - stcb->block_entry = NULL; - if (((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0) && - ((asoc->state & SCTP_STATE_WAS_ABORTED) == 0) && - (sp != NULL)) { - sp->processing = 0; - } - goto out_unlocked; - } - } - SOCKBUF_UNLOCK(&so->so_snd); - if (!hold_tcblock) { + SOCKBUF_UNLOCK(&so->so_snd); SCTP_TCB_LOCK(stcb); hold_tcblock = true; stcb->block_entry = NULL; @@ -13388,8 +13374,16 @@ skip_preblock: } else { error = ENOTCONN; } - goto out; + goto out_unlocked; + } + if (error != 0) { + if (sp != NULL) { + sp->processing = 0; + } + goto out_unlocked; } + } else { + SOCKBUF_UNLOCK(&so->so_snd); } if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_BLK_LOGGING_ENABLE) { sctp_log_block(SCTP_BLOCK_LOG_OUTOF_BLK,