From nobody Tue Feb 22 22:42:00 2022 X-Original-To: dev-commits-src-branches@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 D7C0119E2312; Tue, 22 Feb 2022 22:42:00 +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 4K3DgX5pscz3LQV; Tue, 22 Feb 2022 22:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645569720; 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=qcfwmPTSQ0++4MNqUHYHgIuscP+0cXlLiu2rnpgB/b0=; b=et61hOvA456TnCPvrjsMsKUee+bYYdam6+gRwcUEKDfE6uYBeHbR68JrkqAuw+r02HH7N2 5bqVS4yLAQeJKKw3EQBaFlA5XbnPFjkKK2b8sbwq5gzX22mH3Ei8o+yIb0K05oRG1VkjWk RUDvWCG5ECQz08SPib7hxU1TeTemHXwfdEttihPZ6f4CV2Tc/C7gGFpZqfa1DfmI2jxN2W gCsSYl0iJ8dxiJDbzXeX0Jt9ysm54n5HuAXGkXRTC1ywLls7ZeI/rzFY6KVl8LMLcNJdWE eMi38N9YTMw7iZZSX9Z9eHBB540IenpO7wOt6dtCw4h1TFxocwevmR1poAB2Kw== 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 A836B49C5; Tue, 22 Feb 2022 22:42:00 +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 21MMg0aC052806; Tue, 22 Feb 2022 22:42:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMg06W052805; Tue, 22 Feb 2022 22:42:00 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:42:00 GMT Message-Id: <202202222242.21MMg06W052805@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: 5fb0f68396fc - stable/13 - sctp: use appropriate argument when freeing association List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 5fb0f68396fcb5293bc50e316010c6f5e84d1e18 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645569720; 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=qcfwmPTSQ0++4MNqUHYHgIuscP+0cXlLiu2rnpgB/b0=; b=Umadlsuu6nE7EU9KU76YentDOE4r7RAOOONZPxyx2tdrlQGLGVEHs5qFmoOCpT4tKBvyK1 EM+M70tQ6/oGWvjs9YJITt5Fo0c5WdazwRKInCZKn2BWZuTD6QlZmHVvCZPio10ZYWRosV imRDdRtzDkx/xj003VuCxkR/0nh9h/HlQiVd/V7p/Ub4jYFpuHBzyKaF4dBljeqSfZyMuo WyegAupurTeyh6ly/OMfZBnnck3NmgKtSfzPrBEf6+Nll+c7gdvhhTjJ/ep8EaDe769q0h yHj4wch0FWpoXdpxpq7hLIJaXKhE0w7LJ57V36YIiGHA7pamZ2S0ZymK1antRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645569720; a=rsa-sha256; cv=none; b=NiekVcStEH2D0IyvqRTHnuBbaveolVNKNP27cJ+UQMjbe+Y7XURltSk+JIF7pKbXtcVPxl Vmp+WnxVn4UoghAvkYL8uX2WjjD3Zx8uuhTT6NK9rilPuGYMwy4aiq8Xb2O2Tn+X7hgZwd xRcDfzMFT9j+EWMsey2Ez8dedmoQFyFn2Vc7ujDQvilxunIeU379If2XY3VEDWntH3Jbzp rfZvm0XqdN+pbIBphOmzqSRIQ0HMpEVgvINtIxKl2drwNSnKOLHZWrz2PwAXDl9+kjwGVj 9fyXD4dhCXEH8sz2n5himkekK06WOEdmBI3c6N9z1+xDubdJA2aJOef8sb640A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5fb0f68396fcb5293bc50e316010c6f5e84d1e18 commit 5fb0f68396fcb5293bc50e316010c6f5e84d1e18 Author: Michael Tuexen AuthorDate: 2021-09-09 16:01:35 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:41:37 +0000 sctp: use appropriate argument when freeing association Reported by: syzbot+7fe26e26911344e7211d@syzkaller.appspotmail.com (cherry picked from commit 0c1a20beb4560eaae69202bc49026ab9e2a677a4) --- sys/netinet/sctp_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index de9b1e129280..ce08c8139015 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -12757,7 +12757,7 @@ sctp_lower_sosend(struct socket *so, if (control) { if (sctp_process_cmsgs_for_init(stcb, control, &error)) { - sctp_free_assoc(inp, stcb, SCTP_PCBFREE_FORCE, + sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC, SCTP_FROM_SCTP_OUTPUT + SCTP_LOC_6); hold_tcblock = 0; stcb = NULL;