From nobody Sun May 29 18:44:04 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 BA4EE1B5E4AE; Sun, 29 May 2022 18:44:04 +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 4LB6rh4rWnz4k7D; Sun, 29 May 2022 18:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653849844; 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=c/q2I4EjQ9V9/Ttf2c0OxG4n0BTweVUqXOHsHdV608k=; b=DfcEfGF1eHf4fI5+rYu36zbNz8o27aMrx1MsuEmV3baQUPDXdN8PQi2ec4dtYn7msHBnbq l5gir7Zjbaq/pvhyQUwclMZWRQSb7alhKq5syRr1OuFdGunkbkz2z+jktWDX3SASqwXald sOPrlbt8I9sxNgNYs84ScBR7MjYWD3+hES1nz3fRqKFvq4po1AcOSRHEpPspEWlhh+MdQN eTrv7wdQQ/F1tILj/JWElfvL0XiwUnUJMdn6s8f+g//hMs1BLApV0uSZyNQ2HaJcXYwdVE pVHBhpFH2RivJ5rQ0g88MBXO9tOI2Sk5oyaNImOxOtPLcG5Eg78FOevME0T+Ew== 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 860571B6; Sun, 29 May 2022 18:44:04 +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 24TIi4IR062747; Sun, 29 May 2022 18:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24TIi4nv062746; Sun, 29 May 2022 18:44:04 GMT (envelope-from git) Date: Sun, 29 May 2022 18:44:04 GMT Message-Id: <202205291844.24TIi4nv062746@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: a6a596e102be - main - sctp: improve handling of listen() call 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: a6a596e102be19141d042813e7411c9d931663c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653849844; 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=c/q2I4EjQ9V9/Ttf2c0OxG4n0BTweVUqXOHsHdV608k=; b=Q7sExtg4uK8OWkpX9inswEjqfwM6DxkeKVRbSsm8diRET5Hg5OEKxwwtHW2C7ciS01HsiE gM7BchLSLygyem5zMjICHo/yMEVIZlnjdgUiPgxJzlHLqtu7x4q7wih+K3Shyn+BbQ+T11 1qcpYc9tyCRMqxfPUWRnb2/PBawg1ZX2dEaqIu3Un30Dp0828FzJSMKj8SafWNrZDl7i9c OvWiCkPmx9OPgOmhfPnayGACGPfCqTMQxf7l6SCVK6MxAm+5OPdNgOL4GILlCykvv2k9Sg Aq6jmALSkDrTsY9hYBiDH+HOwJahejqhIYkNDbu8EMkv5Ykqi2iGOS8YvCaIPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653849844; a=rsa-sha256; cv=none; b=NoI3mr8BxcYdr9gmnQSE9nAyrMYFF/PGfbC1e2urFSVr9ZgWOA+IZF5UWqIN8h8aEnNByz MFeoXPVh3xKTPaXk+HOAcU7F0mmZdYx6f97ItFU0VKLi2b0uDLrokgRr7Ve4ucrsUU00Ji hXY1nwcX6VfFyFST6SvU9QvSAiUGHJIW+t5ZeS9Qp7m/+W4fCwN6u3mfTQiBjcsJTJ5KRn icbglIOqhi0gxA5uepgqGhVFGOHvlfuBY6ScfDggwggEEkU/rIN7a5RNhLEPwmps3F23Qh 9f8HL0ejgcCosucij8gVJCiO8GMAyXdyDkmzGcL+Me2mUIaUVhWi0QnZcbQYTA== 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=a6a596e102be19141d042813e7411c9d931663c7 commit a6a596e102be19141d042813e7411c9d931663c7 Author: Michael Tuexen AuthorDate: 2022-05-29 18:40:30 +0000 Commit: Michael Tuexen CommitDate: 2022-05-29 18:40:30 +0000 sctp: improve handling of listen() call Fail the listen() call for 1-to-1 style sockets when the SCTP association has been shutdown or aborted. Reported by: syzbot+6c484f116b9dc88f7db1@syzkaller.appspotmail.com MFC after: 3 days --- sys/netinet/sctp_usrreq.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 05820f2b2859..caa763f28c8a 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -7221,6 +7221,15 @@ sctp_listen(struct socket *so, int backlog, struct thread *p) SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, error); goto out; } + if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) && + ((inp->sctp_flags & SCTP_PCB_FLAGS_WAS_CONNECTED) || + (inp->sctp_flags & SCTP_PCB_FLAGS_WAS_ABORTED))) { + SOCK_UNLOCK(so); + solisten_proto_abort(so); + error = EINVAL; + SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, error); + goto out; + } if (inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) { if ((error = sctp_inpcb_bind_locked(inp, NULL, NULL, p))) { SOCK_UNLOCK(so);