From nobody Sun Apr 26 07:48:57 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 4g3Jjk00SKz6bBbh for ; Sun, 26 Apr 2026 07:48:58 +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 4g3Jjj66xYz414y for ; Sun, 26 Apr 2026 07:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777189737; 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=F8cK+w9rFaP+Sibvg4Wc22vmCqQ6XIPqpFqQSV4ghIE=; b=ewKQWGBS02xMzQvbLBbd06IkqNlmUqg/B51r0Y0/KpfEBRKDvx901B4XOlkRJ40nFfZ/1S zeZ92GDpq8pPiebfnJT9U/DZmWokA9T1GiuOZmNQjWO+SZ7vfmsykk7ofU0/eOl0c2l6Fv SjRlcV1qCulx3qE1KcPtMSjqePpE0dXS4oW/aJOOl8GD4v/VCjczwj/d74fPql0Zu4HzPP XtwskqUIiUjtzM11FSYqp5ndHv0xbh+Y7nBSow+wFFPK3O0NsCz2gBrMu0dU9XmcXSYwME CKF6jJY7AwfohOKtpwdju7d1L4kpQGxnxDZ5MR04asarGSrSMbFY0dZ/eYyhrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777189737; a=rsa-sha256; cv=none; b=XQVSfeD9cxCA+sdGtcbfwJXGvQnOeaNpg6UjQNpEc1U3x86U+tfqh+LfNeMO/qv/hNRCT+ cnmd4a2qDBGf5KKCyY34Sy/wTa5iyqdWN1U9DFLUV0c/M117tENVJz+qN3x9OA9hoBQGN/ gydP0uOt5KG+az0hLf6gcOoDqA8SxgY8KHnYvTy3aJ4qQh97CphIkhK0O5icKSPbVtztcN qyvbwdAcbWlnEXCTKSRrjD21apCJ/eWq/jXpq6cudE8JGPSP7DFR7acQ2TilFGwkV9d1E8 0jh7T+FAdWmMq4bX7b4Q0tAxoCvvDthC938+F6MuXw6NdcYdEpVe3bD77x5nXw== 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=1777189737; 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=F8cK+w9rFaP+Sibvg4Wc22vmCqQ6XIPqpFqQSV4ghIE=; b=ThS75HpM59bV64IktlcsqZy2zKjVzFH5F/KleNyO5EPh+kGT8UIWz8Cv7gZ/KhA841nDzY 6Mtsvt/wfhg+FLdOkze1eeIW1y7nYwcuQMZX5oC3i2KsV6Y9pIjvPWv2ORSEOscw0XwD79 ruKDDZHjfOqy4vRdGNdh+NhGYawlNTi1PZtPKKpP6wg85nGxYHkbWYiD5krkbp2+zQ8/Pu IXzI/ZfCvyqW+ZQwMk5GI04RvtEBAn0WmA0FgYCrS9pRM8REF/N0C2VBJZlj9Tj8gosvja TzqyWnM3Rl+wAgObr49JtN7ai5RtMoPrAc+thtCsRcfbh0whNSMnb71t2LJPsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3Jjj5YPsz19WZ for ; Sun, 26 Apr 2026 07:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25548 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 07:48:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 19fb4df14257 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 19fb4df1425706119b78769031def4bf6f131340 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 07:48:57 +0000 Message-Id: <69edc369.25548.62a18c66@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=19fb4df1425706119b78769031def4bf6f131340 commit 19fb4df1425706119b78769031def4bf6f131340 Author: Michael Tuexen AuthorDate: 2026-01-31 18:11:08 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:47:26 +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 MFC after: 3 days 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 b7e4646fea68..91a3717b876f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1303,7 +1303,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(). @@ -1315,6 +1315,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: " @@ -1322,7 +1324,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;