From nobody Sun Apr 26 08:24:20 2026 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 4g3KVd5Gntz6bFpl for ; Sun, 26 Apr 2026 08:24:25 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3KVd45Fvz49s1 for ; Sun, 26 Apr 2026 08:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777191865; 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=igyd5hVKPaL7KkO/uX00oJf8GWP5+cyB5h90xXYfrGY=; b=Zd0x3Ohawkv5S9PRnejqIGz7972MmJ1wc2BjGQtoaU4r6Ak3rhxmKdSmtkKQ1xuRfwc4YI Nxg/5XAKxOiGp/jpr5mIT9CDaRfJgSNUduojlSASDZiStriVuPeHNm1ac5gbuVbg3oCIrM jeiU3C2UGfJFbO3fTnU/lyvtvybRDX0SIXOZfVb+9zTt30rItQ4aYU42ShmV1Klge1COO6 sSRdurw+BIs9wmqnf5qbd/quNIJuBlT9dK1h8FhQYLU2c4xxMimL59XQpCUpYhTythrK4H 9XnPty12gd1R+Is0IpD1SAMcecpOaBkQyJ8CMb/YuWiOzh3Q1XM28AtbILAphQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777191865; a=rsa-sha256; cv=none; b=DrQq3aD317M7wx3nLYCbraReX3I6POW+DMQG7+aOMi9IXO2kf/gNIsb8LnwdncEiJLGZox LfV+MKoD0A7DJMtLdJ/b8Z56V8rezex//URxA/yMFssdoaI3guRiYB1zwW6DP/zV/4DBEK SfjD+RWij3MS1xwTbnZqC/cKCGb3q9cNmftg4XZAUDnaymZ+bZB2luz86VxNwDRHfHuNtI AKRONVjmv02KOBAbuTgBn/XmWYgiFi3tyOn+f4vykwQuV1Ekln01ekU7JWxQ8z7HU/X2iC DUn5/8SyH2+rmp+cGzMEbdNHbHAcshr/lumyRxBP3URWPPNrOyv7l7dehtkyBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777191865; 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=igyd5hVKPaL7KkO/uX00oJf8GWP5+cyB5h90xXYfrGY=; b=KoESLYzSszYfjAErLjV8j0b2WqooZy5F5kKzE6F1sO61tAVoSZu8hfzZ+RuPbMpmXgbayv XyNGqaMTBZJGwxoLTaxC41Q2GNuG9RZLeXB8kMtf873trtREWXDmefBq3sVYJEqRbbUOl/ QrgWCocdzRxeWwocGrwkJaZE49jpjHv7WkLDaoGjqRaH9/ZfcooG484poVSVJO/j/9gyBc eisxQ5tu6Dk6qE8CRVLkTpOZfSdVYxpZYUuJdIOs3GJciFVpVYdN25fy0Gjwdz3ezf5Jet mtgKE8UTQdeqpzpH43zf1Yg7nvfJ9g99mLm5oNDUEZ0fw7EEWjQn3N4n1K9Y4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3KVd3bwYz1B0Y for ; Sun, 26 Apr 2026 08:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30cc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 08:24:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 70cfba4a0462 - stable/14 - sctp: fix socket type created by sctp_peeloff() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 70cfba4a0462df22ef48b84870e4b4e54079c1ea Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 08:24:20 +0000 Message-Id: <69edcbb4.30cc8.6eca2864@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=70cfba4a0462df22ef48b84870e4b4e54079c1ea commit 70cfba4a0462df22ef48b84870e4b4e54079c1ea Author: Michael Tuexen AuthorDate: 2026-01-31 18:11:08 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 06:22:42 +0000 sctp: fix socket type created by sctp_peeloff() When calling sctp_peeloff() on a SOCK_SEQPACKET socket, the created and returned socket has the type SOCK_STREAM. This is specified in section 9.2 of RFC 6458. Reported by: Xin Long Event: Wiesbaden Hackathon 2026 (cherry picked from commit d195b3783fa4de5c1a95f6d95eb9444abce6778b) --- sys/kern/uipc_socket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 4687d29b33b1..4fca51a853a3 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1280,7 +1280,7 @@ solisten_enqueue(struct socket *so, int connstatus) #if defined(SCTP) || defined(SCTP_SUPPORT) /* - * Socket part of sctp_peeloff(). Detach a new socket from an + * Socket part of sctp_peeloff(). Create a new socket for an * association. The new socket is returned with a reference. * * XXXGL: reduce copy-paste with solisten_clone(). @@ -1292,6 +1292,8 @@ sopeeloff(struct socket *head) VNET_ASSERT(head->so_vnet != NULL, ("%s:%d so_vnet is NULL, head=%p", __func__, __LINE__, head)); + KASSERT(head->so_type == SOCK_SEQPACKET, + ("%s: unexpecte so_type: %d", __func__, head->so_type)); so = soalloc(head->so_vnet); if (so == NULL) { log(LOG_DEBUG, "%s: pcb %p: New socket allocation failure: " @@ -1299,7 +1301,7 @@ sopeeloff(struct socket *head) __func__, head->so_pcb); return (NULL); } - so->so_type = head->so_type; + so->so_type = SOCK_STREAM; so->so_options = head->so_options; so->so_linger = head->so_linger; so->so_state = (head->so_state & SS_NBIO) | SS_ISCONNECTED;