From nobody Wed Feb 25 13:00:13 2026 X-Original-To: dev-commits-src-main@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 4fLZSZ0fflz6TSmx for ; Wed, 25 Feb 2026 13:00:14 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLZSY66hZz40mw for ; Wed, 25 Feb 2026 13:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024413; 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=0Yh1QUS18sGefBmVGYkhJg6zVDtIvOMTDT0gQb0xjAs=; b=xKa2cNaXTuoFCP+TUfi7A5seAPVP+TQDP1G1AhEgK7TlH0qD6XJpnyaeqIUNl7HHzjifB9 hZXSf4AcZnN7sONJCNue7ZL+K+h6/8wNOw80DvyJAh5oJtTm8CSLtERo2OJ+oTkemm091G n1HKyB+skiNUxQk3fEduIhAtnPz6mg0GQZDxNTyoVTF4GMhDQD5BwolNKg5/jRBiVe10B9 0fu9PyvF9B249G7GasGZobuDIj+Oa1mcAscTZzHQY2WX/Wktkvzgx7pOhlTNVuz1b2oCHA i0f0KOuUX/ADi+Yr2pQbaBc+Qkyscqgea2sABA2CnLhbdgNwkbbfPQIJBtZpnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772024413; a=rsa-sha256; cv=none; b=mnMTKFb4GbJEXiVEV5JzSW9/whhULCV6J/rsY60CPMAcPbojEETKsHTiAAOmp4AYVs76NA QXjWypviLRkgPIkeIes+n+aLGwU63Xnr7FZ7CZb9zSHDj/0cMkp9leYRRLkkJGK+ELdt/K PUuqnCvPKMyYqNqVTPOYLuOTrhDKa18Su5ml17zapN8/YTk/w7R2Nw+8a7AhWxd+7J8QjR W4jiupqvU9ttt4+wsTVYL3ArWshxxlY43yMhys6u367UaYw+nVQHPjJly4kLyNEoRYL+TZ WZNOH6grW0C8f62gU4jM3RCrB7mx5gTRzlIorvROJnE8Y/lrAuUSBGrl4qpZ+Q== 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=1772024413; 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=0Yh1QUS18sGefBmVGYkhJg6zVDtIvOMTDT0gQb0xjAs=; b=gfj0DvnHE+m36OJ6G9Fcwb7nErQu3VCnXv2p2+u6GNx3iS9TWw/lf0UUwyX4d8kyyfTbFh favlsJDD9O3B0gCRyzf4Imk4pF9JejRe0LhXzu9RHAtJop8UZK1g9saTMuG/eVxR6eu2wo INVk3SFkPlTcqF+G5lzLsgfGfgXp7oZ65N5w+/cxO3qiQiMdkZihFFr5/DT4isUqNJJ8hP zbPfCf3Z8ke5EZQMq9RHjl+7WaybThr+AvXxzh4nimde6GiqWYzH+NAyMFy1V/60D07Bvc LyRtx6PwDYispAR1PPfEqjowXGg0ohoLaffUO0qVG4y3GMW9k4xCojSA2gz9Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLZSY5Jj1z124R for ; Wed, 25 Feb 2026 13:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42e41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 13:00:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 454212b9718b - main - sctp: fix so_proto when peeling off a socket List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 454212b9718b55b43781f81bef252658e20e0fd3 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 13:00:13 +0000 Message-Id: <699ef25d.42e41.7579887f@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=454212b9718b55b43781f81bef252658e20e0fd3 commit 454212b9718b55b43781f81bef252658e20e0fd3 Author: Michael Tuexen AuthorDate: 2026-02-25 12:55:54 +0000 Commit: Michael Tuexen CommitDate: 2026-02-25 12:55:54 +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 --- 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 8b5d1f504e80..f7c339784693 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1316,7 +1316,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; @@ -1336,7 +1336,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 80d1d58a7866..01f241d29637 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -75,6 +75,8 @@ #include #include +#include +#include #include #include @@ -171,7 +173,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 6512a2d69fd5..0417223680fe 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_generic(struct socket *so, int events, struct thread *td); int sokqfilter_generic(struct socket *so, struct knote *kn); int soaio_queue_generic(struct socket *so, struct kaiocb *job);