From nobody Sun Apr 26 07:57:03 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 4g3Jv90ShNz6bC2p for ; Sun, 26 Apr 2026 07:57:09 +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 4g3Jv86sNvz42lb for ; Sun, 26 Apr 2026 07:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777190229; 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=tVcEN6KFXp76V95tFF9GnzvNAsmwp91c6+WYXOqZCZ4=; b=nUjSJvuARjQUuLfPlaZ3LBCKnUzmRxTSeldFqKuUULuNgRxXXM4crYd4yqsxDbwERUb3cT fzrbyZ5EXSX3dFobqniKFjOqMMZia0RvCDpn+6ux5lNyoA/PwZIuGm35+cWmcqM1mPFEs0 oUKfgzHKfa+gRDNm8xYit9tQHieCyxURCtZMJsF3BJxxvQfRebRXp9YMOztBEqJvo91XBF /ivjoxXgswsf9eqI32CrhFLEluBZDlC9vI0tqkCPb7gVDbanlNWglBtvjL110g30xNGb5T iwlf7+Yf6igJy2K8TlpNUzDZrfNz0nubKl0hQq1voGYwwfPKSZSSSIFL8xgEAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777190229; a=rsa-sha256; cv=none; b=CWfkCZYBjq6Wg7FenZF9hV1Zlcis2xPt+jyXRvu3abtZoa2nXL98qDkKtv7gac2NaSVq1z gsSzVErHOUHBVWIuW5P6GHar5GmD4GRjexhH0hHVfQlkl3DT0t6BoJuvIZpjx1o9T6NH93 2wK2BLMGUlELYxmOWtiNiu9VEDWGmV+xlV3TSXEK39CG2YYRo/ih2qEVc0YDHRN7X//HN2 vrym/uLglmqHWFX6BBQ2DKqrjNOO3o69BFINL8b1L3qw0pTVIEtfaqsB/sy5QCCN62CCk2 GlPsQyFXFfU3dz7WOCDrYtnyHyBnNqiGzAulGf2uSZAqwQHpFa9cd/eBnxDDRw== 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=1777190229; 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=tVcEN6KFXp76V95tFF9GnzvNAsmwp91c6+WYXOqZCZ4=; b=g3xWPaqEvmGMVHDlZLKCEjRMX1nORbv5HxSOvyODs1qmoCoCrwyVZNofSPjWgTaVT+lKew IKqZHsJuIaxnypTKy6pIAqoRZy3qJlupAhgYuYjp8/VRDgkb3CJDcfio7LPz8n3DXjRPDh /pghAXEWDyKTwCCqGPcgBsq8NKgSCfEWpghck59ZksmJbqJKQgH1aEczPx8s7zNzqclx7L Fcw/OtoEJ62kDtthEjKWGsGkomUvis/qNy+oxb7pmzV5l4HWlMRe+K7qy8ET+I9eWg1+WI WQZ6Joh1gjUe4AkJkDGhMszaXdsq3MFu2w8Co8sOuLr7U81m2n0D7iwqak1DgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3Jv868rVz19kn for ; Sun, 26 Apr 2026 07:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 07:57:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 902f2016450a - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 902f2016450ae02d889c62b57631d491b0a67e6d Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 07:57:03 +0000 Message-Id: <69edc54f.264c0.43a1fc4c@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=902f2016450ae02d889c62b57631d491b0a67e6d commit 902f2016450ae02d889c62b57631d491b0a67e6d Author: Michael Tuexen AuthorDate: 2026-02-25 12:55:54 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:53:49 +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 91a3717b876f..358393a3bf9a 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1309,7 +1309,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; @@ -1329,7 +1329,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 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);