From nobody Wed Oct 12 23:08:41 2022 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 4MnpHF5NN8z4fHyH; Wed, 12 Oct 2022 23:08: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 4MnpHF4pzZz44lm; Wed, 12 Oct 2022 23:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665616121; 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=XsCfahsZ1q052KLxdUBUBQw6urHI/3HJIgGazh7JpSo=; b=qSD42xXgxGQixXXq/4vPt66J48XBHzs9WuaLlz6rDH7fEk80YW97RO9e96qc+z7MwP+58R dWwpd2tc7vevknsfYzySNYZffg+Q1jq8BEMEnuiv+wpcpSiIOutBpnm6EZmqNFLzf+YIc7 2I3/gidF3N8LGmJrRTNXYsuqOKXgNjNbMqAMwaEpo5IGsjBMSyJiqeE8vXEQb6pWL6egMv U9AXArn0Eg0mNMUomhDdO0glZPkaLh4gWZaw2/1PqJWXR5Fz2t42X1m/DAeo3eJCcu0CCL axRWgNM8/9REFlIL31kGrD0PHGuEEI6fIT8k/sVPO9CYE0o2CSwvtl00VzGKBQ== 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 4MnpHF3qZ2z1SQG; Wed, 12 Oct 2022 23:08: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 29CN8fYD080182; Wed, 12 Oct 2022 23:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CN8f12080181; Wed, 12 Oct 2022 23:08:41 GMT (envelope-from git) Date: Wed, 12 Oct 2022 23:08:41 GMT Message-Id: <202210122308.29CN8f12080181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: dd36606b1bc9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: dd36606b1bc90d1459e0d04be4ea5859d3eabb16 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665616121; 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=XsCfahsZ1q052KLxdUBUBQw6urHI/3HJIgGazh7JpSo=; b=DHcEcpfBQ/RoYfMQrTI1v/I0iUd1/VjEcnLo27yVWqSRqEJvWAYdvGCuAkL4D0fQaAtpMW 0KocAfqiPn480JKY+f/sm21UK5Pjv+TGUJ2U787gBNrpj9RzguHA+am2zUulIBB3isShM9 Z3kK7t5pzpcm4Mp1SmRDy9N3T1rZ6GOgFM8rxB1Rdiz7F31/bU1NEXqqg1lK70Xig9uheR 1SDeZpf5XX814WBeS7FSk8Y/cUvyvWNV5mFz7aq3Pd9WO0PSM6soOfrUq24TmNVNUVKATi 5RLRDSmaiaXLTOAA4m8Eb7sva5lSJv5fAPLUlvZuAjHsllSS72teXY2MZ4ZNJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665616121; a=rsa-sha256; cv=none; b=BJAA7+xa+G03K6Vd/2LsN8Hd2Ku2PhnnK0IooKuJcT8rV6lJn4lNydr0F7kuhe0t666fql Il9VZypvZNlTLKt0TPiUBKoUA0osqEnR+QklpmfdUtbw2I4l9v3Ds/crOjFGcYAXn9uLlE QFd8lQu1BhTfpPpAXTvmFvHmKtuPWdiAIcv7cwAtrgbBhFQtsQYvwwoyXFTH+WXA9dG/fF wjaDkij5ZPUJAD9IgGDpRxck3P5Dj68JqvltyCny1Bw+dvrecvfbHUulSO80RJJ3s8HAzY Hi8lkilclelGxxc150K36vz/vcSfCg64Tske3zhZX84Z/uOiMEeQ9/DF3aAOYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dd36606b1bc90d1459e0d04be4ea5859d3eabb16 commit dd36606b1bc90d1459e0d04be4ea5859d3eabb16 Author: Michael Tuexen AuthorDate: 2022-10-12 23:05:44 +0000 Commit: Michael Tuexen CommitDate: 2022-10-12 23:05:44 +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 MFC after: 1 week --- 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 46b818c9983e..3f5046811258 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); }