From nobody Sun Apr 26 09:07:48 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 4g3LSp2dvDz6bJnM for ; Sun, 26 Apr 2026 09:07:54 +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 4g3LSn4BlMz4H0w for ; Sun, 26 Apr 2026 09:07:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777194473; 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=snJ2D33NVAxiNAceciw7fyxne+5F6ecSVeaOOqJcpNs=; b=YlJWc1ser8tGYK6GQ/b72nk6Qj4C5ahVI+5dqofrZB3F9JiwXd8Z1dGpKoDLIPNxrUsI98 sr8oyBI/UNbbHI28MONG/Hs7Dft6eD5nxpp4ogPV+LJz/1pRdJ7VDZrg0lHMhEzl47WynM w/YHu2FW+djA/2b81TdnS9t4WvdXaU2bHxx8QME+PsIoVQw+flhsOjSinvhFDO4mWODkq2 yVgZMsrcu4fyYBWxP1s8pEGWeNjSzwXS7vSgQv35tVwZ6YuauO9a4AXeVrWXobDpbAoO3U d336KPV2l+pdLa6gThlyGt7bCbgz13e+anQW+cBKa6bzayUi6+H8MWqW628/gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777194473; a=rsa-sha256; cv=none; b=PYFNsA3nKFRyyBryTr6eWpZ66WgGSqK+4NUpPqj+JIDPRVM6gS33Qf/C9fR7tPbDRmFdor l042F4fYzXKy2T5Qf/ZZlS5LXSnjMMpoU+I0bYgQGYOHjQEJVJIyHrQhzifvLlxxTzNZAe GboWL9GEZ0DdquQKrM5YWLov3X/Zk6e2tBrhGzKtGXArb/9OtbBKsPRe0xPnhl1E2CuOmS CoJ2VdTCZ+lml6mKPYWQTyywYSEdudOsg4DmRfZep1VvQerhpy5t/TV3VcMpesjye1nMgE LNtT7fjuwMPCbaw5bjWhw5DGH6Rmthng4AlYUkHjlWgbV+yeB+/zxeSwSpbmSw== 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=1777194473; 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=snJ2D33NVAxiNAceciw7fyxne+5F6ecSVeaOOqJcpNs=; b=Vh6LhToVeIiVRQ2oj5iwcI9uAgC24tUx/3IqsioXVKYMmL+R5wneOePcNGeULM6drMdmLq IZiSxO3EwHdOs0DJrxUa8d6ly72gys4iW1Y5DWLsljjqV3c/zOmWAdtmNpdoXaKyyZJoN9 msFbnn7SckxEX94FLMGvmxGLUGZ7b+Nmyaw0GZugwKei1HMTsXIWiOGq8GZs6ELOxaLUxH 442bF26hrKi2aDmUWNY5l3tLq5U2kKxPVhWjCj+jl2adufWJqC5DKDlN8gAbNxmgw3AGTI JRWTfxLMrap3IZPU4DGxa0zQfRMXSlW61W7+/n9BnmVoU5QS+s5wt/lHNCKueA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3LSn3lG8z1CZp for ; Sun, 26 Apr 2026 09:07:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3702f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 09:07:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: dd4e2803da39 - stable/14 - sctp: fix so_proto when peeling off a socket 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: dd4e2803da39fdcc3fc73d2ee710f479568ce3ad Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 09:07:48 +0000 Message-Id: <69edd5e4.3702f.313e888a@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dd4e2803da39fdcc3fc73d2ee710f479568ce3ad commit dd4e2803da39fdcc3fc73d2ee710f479568ce3ad Author: Michael Tuexen AuthorDate: 2026-02-25 12:55:54 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:00:53 +0000 sctp: fix so_proto when peeling off a socket Reported by: glebius Reviewed by: rrs Fixes: d195b3783fa4 ("sctp: fix socket type created by sctp_peeloff()") Differential Revision: https://reviews.freebsd.org/D55454 Event: Wiesbaden Hackathon 2026 (cherry picked from commit 454212b9718b55b43781f81bef252658e20e0fd3) --- sys/kern/uipc_socket.c | 4 ++-- sys/netinet/sctp_syscalls.c | 4 +++- sys/sys/socketvar.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 4fca51a853a3..2e7bf0b5e5fa 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1286,7 +1286,7 @@ solisten_enqueue(struct socket *so, int connstatus) * XXXGL: reduce copy-paste with solisten_clone(). */ struct socket * -sopeeloff(struct socket *head) +sopeeloff(struct socket *head, struct protosw *so_proto) { struct socket *so; @@ -1306,7 +1306,7 @@ sopeeloff(struct socket *head) so->so_linger = head->so_linger; so->so_state = (head->so_state & SS_NBIO) | SS_ISCONNECTED; so->so_fibnum = head->so_fibnum; - so->so_proto = head->so_proto; + so->so_proto = so_proto; so->so_cred = crhold(head->so_cred); #ifdef MAC mac_socket_newconn(head, so); diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index 9d85576e2592..79c1dfb21495 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -76,6 +76,8 @@ #include #include +#include +#include #include #include @@ -172,7 +174,7 @@ sys_sctp_peeloff(struct thread *td, struct sctp_peeloff_args *uap) td->td_retval[0] = fd; CURVNET_SET(head->so_vnet); - so = sopeeloff(head); + so = sopeeloff(head, &sctp_stream_protosw); if (so == NULL) { error = ENOMEM; goto noconnection; diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 1efff4a18bee..fc884467470c 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -525,7 +525,7 @@ struct socket * struct socket * sonewconn(struct socket *head, int connstatus); struct socket * - sopeeloff(struct socket *); + sopeeloff(struct socket *, struct protosw *); int sopoll(struct socket *so, int events, struct ucred *active_cred, struct thread *td); int sopoll_generic(struct socket *so, int events,