From nobody Wed Feb 01 23:59:58 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 4P6f6l0w1sz3cPZy; Wed, 1 Feb 2023 23:59:59 +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 4P6f6l0S53z3hV3; Wed, 1 Feb 2023 23:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675295999; 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=7gdDoA0jq+NiPis3ZYOGNNnShDgvHy/+uHOu1iiDq80=; b=xXmxz4VYEhpenCsJQzsqFRrzxhEuKBDU3dnmhPPbhOiAIC3vMzFNb3N8lnNhbyFMpDS9Vp EFXZL8mQ1/RLlAubGMOHy8237OBi+lpsVr+glfLIcx/9jCpNNu4wd0rP0QI7VBnaFPB5lB 2rs3xgkzzqN/QFddBUMcRUncuO3C0xFEzkG6yPCwa+o53I2YRyXd1ibAyqUgIGlb1MeAnj rkGmhugtaEE8CQB4Xnsm01aOIbznQfl1cqWvQar6A75gDRS/op76JyrzN0rHS9fBMqBdfO nDjQfxOcx/e7MPRRtovU4h5Zz1nAURWGbVXjcmGPKfiXc/QggYjM7RPE2i0GwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675295999; 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=7gdDoA0jq+NiPis3ZYOGNNnShDgvHy/+uHOu1iiDq80=; b=poShiKqLSlHUQl16joF4PoxF1pCoYlogpqA1iBpG6GFHTehc0HfikQz3ncy+Jrk2Re5mgy AzpRpTF5WhjtDvZlrB1prRZ2ofTA86ajtzxcDwK0ao7GqqKj0wzYwRDV3AGkxhp2XdrA4D v0+BGOhUWJ81F03rfub56Xs8/fBErgVthKU4LSkRngKuNM8ZWZdaJe3mfHobvb4Z8RciVZ m4igc0kqVbptlI0OVcuFzZen6EvV/1CYD4eFCEHv+LQQculePLNjJxe5uA5rgdfS9DdqnA O6hVHM5bu90pMv7cuH0iVWVbG0sD4XlYMit1aFaFhKUqa34WZJ/GuJT+Mi4g0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675295999; a=rsa-sha256; cv=none; b=FSKvyhTuD4Zpb0r13YWtYOSHae19EJxHPzc9aaWLGaOCBpF/jZQfOl54vcjkV2UOes4BKy jACzfzr9WTmjqjC2FYwj5Wrk/mSeS/8uukA72yvJKYRKMbV9e1YjSn4FtBLzvPdUo3igMN Wo8WRCGR7vq1r6qpZ6J+pmbAq7w2hDJ06Pjv0+MyPrG0SjdUoIfI0S4O4bZCql2Lz10r2I KWKZXGiaL2pHRXtHn6c0VzFv+dezECPt2ox8ID/N9BtJFAco09pz7n4B7GhiOCnLsIIRgD hcrkmw4XEsYJg5rI54LD1iTZbm3kFYm/KletvKYP6DVkR7PyDqDIEEN3N9ezMw== 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 4P6f6k6dbgzYGH; Wed, 1 Feb 2023 23:59:58 +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 311Nxw6p005930; Wed, 1 Feb 2023 23:59:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Nxwav005929; Wed, 1 Feb 2023 23:59:58 GMT (envelope-from git) Date: Wed, 1 Feb 2023 23:59:58 GMT Message-Id: <202302012359.311Nxwav005929@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: 91a9ebe24a70 - stable/13 - sctp: improve sending of ABORT packets in response to INIT-ACKs 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: 91a9ebe24a70f6fdb9e4f1e8d91e5ded52541f12 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=91a9ebe24a70f6fdb9e4f1e8d91e5ded52541f12 commit 91a9ebe24a70f6fdb9e4f1e8d91e5ded52541f12 Author: Michael Tuexen AuthorDate: 2022-10-12 23:05:44 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 23:59:34 +0000 sctp: improve sending of ABORT packets in response to INIT-ACKs Ensure that the initiate tag of the INIT-ACK chunk is used as the verification tag of the packet containing the ABORT chunk. Reported by: Suganya Dharma (cherry picked from commit dd36606b1bc90d1459e0d04be4ea5859d3eabb16) --- sys/netinet/sctp_input.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 6fa4d0323d94..836f09f4887f 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -412,7 +412,10 @@ sctp_process_init_ack(struct mbuf *m, int iphlen, int offset, &nat_friendly, &cookie_found); if (abort_flag) { /* Send an abort and notify peer */ - sctp_abort_an_association(stcb->sctp_ep, stcb, op_err, false, SCTP_SO_NOT_LOCKED); + sctp_abort_association(stcb->sctp_ep, stcb, m, iphlen, + src, dst, sh, op_err, + mflowtype, mflowid, + vrf_id, net->port); *abort_no_unlock = 1; return (-1); }