From nobody Thu May 21 21:21:52 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 4gM1Z93W28z6dyhZ for ; Thu, 21 May 2026 21:21:53 +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 4gM1Z90P1Kz3D2V for ; Thu, 21 May 2026 21:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779398513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2+WVNpdSR7JCj1Fydq0CFwtpf5FNnIS3LvaCTODHWl0=; b=EbBVyTydJQRLKMs5C0mMvfyAKoM6e+Tc4jU69+TrIVfHrktBvVMBCjnAvY9fgM/PCR9vuZ MR37DI0F5qT0GvgaPETIJgtTNaSWsnDrvrT8DHNGPKIDgxv1zluYPNfpPzwTm4Cpwzs2UI iCdlr77M/9W0VfiYmCrtv4W0YNfIozXQQNezlN4oLmIuJb1m9uD1NN5zYu5XlP6apKEjx2 h0uOY9IGq8oglL2hOTLQUPy7pVb0/uklPZ5Syc6l/x31lLJhKbb+krx0jKnEnjxIgm3kbK ylndNx5srf3hc5GGlyZUEPr0mfudVKJQFwYJcRt/ZiDN4tlCL/tMZKrpDWSjiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779398513; a=rsa-sha256; cv=none; b=SiOk1qiK1BICRZVYPhwronNrHHVLH1qacKMtyCIPAtSX4cmhGBPgNEtbsq/s3/fvyfMdK8 ABfrHmtm/TAy21qlpSJ1SAt0+7fHste/YccJbRa+pTT1JwR02HRlRQwfSG2MBpJ8airWDi qkAZ0K6yi/oCYT6yTHAIwIEBx6ectke8ryY/s775fq0VbZN8GnGb7j2VMxSYFGyHZsDeoO QIfYgN7SAp0kvTMbqnHRVcxo4lcNQo4PtWAYzorO9yyLr5OjL6cuDpUNzKiAYzyIcDNhtP oB3UALQTLGSiGC9aXSMi9AubCIYCtPlXl3dxGLnbp1g0Fv0/qQV+ZaA/hDGjag== 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=1779398513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2+WVNpdSR7JCj1Fydq0CFwtpf5FNnIS3LvaCTODHWl0=; b=KKPF5hq740UO2OE0Pwe9t9hz0EevcpsYnwdGih/y4YQPv04s9IiMHM1rCF4tdOEr40UGLK FykhtTyZ4jFh0Z0oAnWlvrn18d2UbrdwynV0wjEd0xY8J17y8kfCyNo8Z6VhcOOM51jL0Q 3jxhlG8WUnxuhU7IlG9EyVtVqs0kFT+5kSEeSv+KRr7+B2hcTPWalwGHO1i+kpwwX4mffo vl+EnUfKOQB6gQjyS1FMjtR2WMKb6C41hvSv/zUFWsFlNjkFXor7LSmgtBEq4N3lU9EbX9 Ym2BSL8DRcc5YHSynyEmEwbFleyA9YYIE9AS5jL6OgFkyKMPEEPld4pm0AZlmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gM1Z874qxzqrW for ; Thu, 21 May 2026 21:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e0ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 21 May 2026 21:21:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michael Tuexen From: Colin Percival Subject: git: fee67650e0f5 - releng/15.1 - sctp: fix NOINET build 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: fee67650e0f5d2e1fe2f14ab0d8a1b96c7a7cc61 Auto-Submitted: auto-generated Date: Thu, 21 May 2026 21:21:52 +0000 Message-Id: <6a0f7770.1e0ba.27ce9ad5@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fee67650e0f5d2e1fe2f14ab0d8a1b96c7a7cc61 commit fee67650e0f5d2e1fe2f14ab0d8a1b96c7a7cc61 Author: Michael Tuexen AuthorDate: 2026-02-27 07:51:29 +0000 Commit: Colin Percival CommitDate: 2026-05-21 21:20:55 +0000 sctp: fix NOINET build Approved by: re (cperciva) Reported by: ngie Fixes: 454212b9718b ("sctp: fix so_proto when peeling off a socket") (cherry picked from commit 6bd97e9e01ff159eef49b2521fdbe67d5db10d95) (cherry picked from commit 9c440e552c4cc252fe150b5f0edef9b8cd75a72f) --- sys/netinet/sctp_syscalls.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index 79c1dfb21495..da7d0556a809 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -30,6 +30,8 @@ #include #include "opt_capsicum.h" +#include "opt_inet.h" +#include "opt_inet6.h" #include "opt_sctp.h" #include "opt_ktrace.h" @@ -78,6 +80,9 @@ #include #include #include +#ifdef INET6 +#include +#endif #include #include @@ -174,7 +179,21 @@ sys_sctp_peeloff(struct thread *td, struct sctp_peeloff_args *uap) td->td_retval[0] = fd; CURVNET_SET(head->so_vnet); - so = sopeeloff(head, &sctp_stream_protosw); + switch (head->so_proto->pr_domain->dom_family) { +#ifdef INET + case AF_INET: + so = sopeeloff(head, &sctp_stream_protosw); + break; +#endif +#ifdef INET6 + case AF_INET6: + so = sopeeloff(head, &sctp6_stream_protosw); + break; +#endif + default: + error = EOPNOTSUPP; + goto noconnection; + } if (so == NULL) { error = ENOMEM; goto noconnection;