From nobody Sun Feb 20 13:57:24 2022 X-Original-To: dev-commits-src-main@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 769D219C9C74; Sun, 20 Feb 2022 13:57:24 +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 4K1n782pd1z3GNC; Sun, 20 Feb 2022 13:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645365444; 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=6DrqHLwYwl9kHdvoz+G1xypJjkmql+hp1MZW+U1iQ50=; b=IyHGQom2JFuufegrDrTrgs/X8SPu5Zo+pOUScXvvP7LC+QoOQYICdx5U0Urx0MJQGKRU/3 tu6NXNNf5+NDKzGsZuQph0kx/OXkflvQ2KREjqQR5g2mR4rNakAsZ5LL5B6lanjRbfBnvE nOeWQ3QUB8SjT6m18FSSNKi4LY4iFt830kCTLtU5odaw7zo6kcdkrzKjCZ+1XiUqOihmZh Wgq9xQkEmr+oColJ1znFdp7lYgV0tuEDKHgWDZuR1+qRyGkrhrxzGIEn9BcPWJrBDTwLGQ 7ddci/xaD/2ar5iN2vyUCsaO6yXnupJNNEoIJOVk5SVn6Trg//uVmaSFhES5Iw== 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 33A471DBD5; Sun, 20 Feb 2022 13:57:24 +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 21KDvOoh066138; Sun, 20 Feb 2022 13:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KDvOdB066137; Sun, 20 Feb 2022 13:57:24 GMT (envelope-from git) Date: Sun, 20 Feb 2022 13:57:24 GMT Message-Id: <202202201357.21KDvOdB066137@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: 2f0656fb9ba2 - main - sctp: don't hold the assoc create lock longer than needed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2f0656fb9ba2b962be7f545763fd8c55640ded00 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645365444; 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=6DrqHLwYwl9kHdvoz+G1xypJjkmql+hp1MZW+U1iQ50=; b=hLefwwRt556Fqnc+xVPT6iIC+/BZK4ByP67XdHVdNZHN/1w01t+f/f+0UKu4PxqLzVGfpq /fxQ5eEN50/45bJXH/9Bd5TSFXpVLnM0jFdaUiR6fwIn0ZzL29VAVMAmWcohBC/x3kk1yk v5DT1+vTNxNMhBubu7+LiA93+CB6y4qli028hsIkJVz7hQqD8v8keiA9bQf0bFvK9+86cr S1ku7y5E4dyXdbH7ksnBQZxh2d4Ko3NuRBxhCWi5a5lqDirAD1dK+TSCLpZWMKjfyhbsuK tPqbULOt7Bmk7vb/b+1g2aSCIbqpK9vrG3zPyyDfXt9ao3ZX5+3OLVJM22y0Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645365444; a=rsa-sha256; cv=none; b=VZ9JB6n6i3xV7WOvN+WqDIjvHmZQKnF/aEY6KMb83q9jNKdhTyJ/SHyjiLG7+KxMu8PkJW D1CzVpAnuC1EeQyPa9k15PwoTVasIqrURx1FejRIL3P2K2nFFMHmqEJEQByTeERDozwsUo 7vIrZCNyvTzlzTopuAY6/gOzcCHggiQv/KJHO9joTzZGWjFTF1K1p0oaKr250cP4Y7d32M DDTil1yoGPymBsbn5GSqHG01cHNJuvxdDDSvOOTPdHpUbyM/uW1990fbKaWJm3975r5qCj 56abo8G5pNJQuwzidaNoCBHbu/9sGWit1nPg3Opk07Gja3tb7jNo9ZydtRhOzg== 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=2f0656fb9ba2b962be7f545763fd8c55640ded00 commit 2f0656fb9ba2b962be7f545763fd8c55640ded00 Author: Michael Tuexen AuthorDate: 2022-02-20 13:55:41 +0000 Commit: Michael Tuexen CommitDate: 2022-02-20 13:55:41 +0000 sctp: don't hold the assoc create lock longer than needed Reported by: syzbot+c738e3df67cf425c49a2@syzkaller.appspotmail.com MFC after: 3 days --- sys/netinet/sctp_output.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 3d81fb2b4288..86cf2ed75e90 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -12716,6 +12716,8 @@ sctp_lower_sosend(struct socket *so, } else { SCTP_TCB_LOCK_ASSERT(stcb); hold_tcblock = true; + SCTP_ASOC_CREATE_UNLOCK(inp); + create_lock_applied = false; } if (error) { goto out_unlocked;