From nobody Sat Jan 31 18:16:09 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 4f3Lff137Xz6Qdjh for ; Sat, 31 Jan 2026 18:16:10 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3Lfd5d6lz3xJt for ; Sat, 31 Jan 2026 18:16:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769883369; 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=Ytt/+1XWqmHHLBllIYl+gSKUFRfD0bcLzeVY94daLKI=; b=r7iK2RABQDQ4NpUilEtnKVdDWGNyx4f1jkZD6cGS3/2VdSd22djAuYL0lZFQp7sHp5/yZi HK6Q/rXq+65iPc96O36t8LIqiN9I83fdqHkTD8JCRrGdOAKhFcHUrKyqGM9qbR8v67Gp96 pBINpQjmZZMpFDUfkM8lxbl+vIUzDRfbR9gIqOCJQwUfM2tdFTellGoeFYNG/38Xk+fIQZ jgA4cBRna3tYfmCyoPwMqmuX/5o1BAElerOqOTD1zxvgn9dCIgwGRpQvKYGMU+S0DjJeau yVoVo7e/OFk8xDDMHANvTSYOhfPpGsW8QkBTlURJ5DoGnF7iDMfTXt9qlVw7LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769883369; a=rsa-sha256; cv=none; b=c+lhB9s3oVcTIjzA55qKdGYgr7w+tgEgRgAvrLQg55o4Sg3aOvi39xFt32GTY5opIxUK3M wa/8T3RzJpU/tyqGn5pjZ2LrXLxc3+RiPduPuO+OwgrxkvjFTl8aQl0lHUB/80GQ8FIovP 4gwFsnOD48Q4FgBLNxWNOY6LP82pcAR1PH5CIeATe6m2PnbFT4xA6hy+YIRhok1Je/5R+P P2RMD8d05RwV9GfW3xdRcACdqi1Q36UAe9DxRguEGlAEuiMKsiPJppbtFdk5fGx/tC8zGa o/FNVwA5ryR1yRRTmpiCnb2N+i8dovmHgZMX8vISK06dv8S0ANjK7GA96FshJA== 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=1769883369; 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=Ytt/+1XWqmHHLBllIYl+gSKUFRfD0bcLzeVY94daLKI=; b=b7bAxOi6hgFCWfxHTGH6C33HorBo+mADpUxv6qtysmwPaJhHVsXQlv3A40Ced11KqEyVys fYIx1QA7ayh75Fae8rya85vc3hwpS7tKXNcU20gUaHgJf93T+fzfpHtqYxYa6cOlNqaayC OOYI5ravaasLvg7rJKYxSfI22qEiTWB2Q1Z+YFqYf2BM6Cdcy8iDkI9k9H/98NrnQFK0hG NcvkkYMpWIrJYVN9KyAsebbKELcpTyIbrX3INFygKfUFaufUbpgE5JeknZeS2IzvPpcke0 dkgWEebn0TD3osardD0FvRogStU9pEeqovJ8nLF+ip06nMN6W01xIurVHJC8RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3Lfd4ZlPz14Dx for ; Sat, 31 Jan 2026 18:16:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2271d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 18:16:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d195b3783fa4 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d195b3783fa4de5c1a95f6d95eb9444abce6778b Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 18:16:09 +0000 Message-Id: <697e46e9.2271d.66b41ecf@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d195b3783fa4de5c1a95f6d95eb9444abce6778b commit d195b3783fa4de5c1a95f6d95eb9444abce6778b Author: Michael Tuexen AuthorDate: 2026-01-31 18:11:08 +0000 Commit: Michael Tuexen CommitDate: 2026-01-31 18:11:08 +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 --- 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 efc8ebfcece2..4014006ce2e5 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1292,7 +1292,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(). @@ -1304,6 +1304,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: " @@ -1311,7 +1313,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;