From nobody Thu Oct 29 06:52:35 2026 X-Original-To: dev-commits-src-branches@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 4jFZfx2s6Cz6xvnh for ; Thu, 29 Oct 2026 06:52:41 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFZfx24R2z4HF9 for ; Thu, 29 Oct 2026 06:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256761; 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=ndE+dwQ1Z77eZzrdAR7K8o98SUT6I+op1dj9uYfDs9o=; b=gldU1tspMSFgE1bMJ23EHNot3IwtYWMnVPWcQWRemdBmd0jBIKx4Rubpy2/o82LIHjWc0P r8BLXmlixONjk5V/xibVokA+gOp9TO3HVFGxkNQbhaMzPorM5yzCURSI6DrGXPkBNuUa5d QU1obEdjXAGjYmpbt0mY4Mv75ly7Xn53FUCc2AYRoF/zM/eBpMsYs5qsZLBsoEGII/1k8U Q3rZIPUfhEhksaa15CUzmZrgF2RWzl8RTCpuN4K4HKv4/Qt4Gw+/etHC5CqDLnazAMmbfa 0pdhf9kf20tjmFqG09my6X2YUHlzGaUoiIlLrdQ9T1WfFQTmerFjeyzBCc6orA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793256761; b=c3mkTBR0lflNsuSv6LtzMAkT1sTWqk3Zjff9DwRND+k4Bfj2d3Y73sptDE8XgAVvtzxYOm HYQarCJ5mUbMkUjhcZpz+88s9hG7GTHARMH2wG16mF19KJsBuTC5Doxrt8A9Ii0etHUsYf 8iJV5nb6/S8VULtJUELQtkaBLew9atv2uzf1s0Jq3ZQVyMCIFcoez168r5++1qirikS4SG BQqwnDNqWue28+pkHk8KhA9ZFYBDS1LuFQUyvOMHnZG3kh+xhUZGR4cNAL2jE7MAsyCMkU LVUGmTKXV8MoLR8xxpfVQwLFiux4LxEFhInPOe96wES4JrBo8h6Ua1PXO08DnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256761; 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=ndE+dwQ1Z77eZzrdAR7K8o98SUT6I+op1dj9uYfDs9o=; b=nuH++sUTGIZOv+KJx+43wAyz4ujYLEWgLxdfPF20t/MSvHLCNnJFvXJVm2MyUH3gxn8X6V zNnJwEkGkeFKNOhKBjCctoSIxAHhXV1ZmWeoQE1zRn0/q98OwFHUSgDUSGe8Z/9+mjxHKZ nTTaf12taF6ru25MccEcZXuis7oGyefXdFFo7O+tQkN0o1UNzHWvB7AaTaKVsx+Xx4JhPj 7+HGo4+JIBwc4QXkVqtuVxJjQMN1PJjyWqRvPnSXNMvbVD/lHEgJONOFcXEwbL856P8GuI flpfKLeZeI6nUEJA6vA8dvtWA7N4oPfy7rjBLmyJFfdP0vmKFV7D49SeVXydPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFZfx1lPYzSY3 for ; Thu, 29 Oct 2026 06:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ff58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:52:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Albin Hellqvist From: Michael Tuexen Subject: git: 434994d73c5e - stable/15 - sctp: improve handling of SO_SETFIB socket option List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 434994d73c5e9628fb777518e4b63045e0620d9b Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:52:35 +0000 Message-Id: <6ae2ed33.3ff58.10f55e6@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=434994d73c5e9628fb777518e4b63045e0620d9b commit 434994d73c5e9628fb777518e4b63045e0620d9b Author: Albin Hellqvist AuthorDate: 2026-10-26 19:07:03 +0000 Commit: Michael Tuexen CommitDate: 2026-10-29 06:51:06 +0000 sctp: improve handling of SO_SETFIB socket option Since SCTP keeps fibnum in the SCTP protocol control block, the code can't just defer the processing to the IPv4 or IPv6 layer. Therefore it needs to be implemented in the the SCTP layer and it needs to call the socket layer function. PR: 300091 Reviewed by: tuexen Fixes: caccbaef8e26 ("socket: Move SO_SETFIB handling to protocol layers") (cherry picked from commit 7b8151b0cd1b4f077b382b6be2c02c936d1988fa) --- sys/netinet/sctp_usrreq.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 7c615b4cd02c..9352fcaff506 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -6869,15 +6869,23 @@ sctp_ctloutput(struct socket *so, struct sockopt *sopt) if ((sopt->sopt_level == SOL_SOCKET) && (sopt->sopt_name == SO_SETFIB)) { + int optval; + + error = sooptcopyin(sopt, &optval, sizeof(optval), + sizeof(optval)); + if (error != 0) + return (error); inp = (struct sctp_inpcb *)so->so_pcb; if (inp == NULL) { SCTP_LTRACE_ERR_RET(so->so_pcb, NULL, NULL, SCTP_FROM_SCTP_USRREQ, ENOBUFS); return (EINVAL); } SCTP_INP_WLOCK(inp); - inp->fibnum = so->so_fibnum; + error = sosetfib(so, optval); + if (error == 0) + inp->fibnum = optval; SCTP_INP_WUNLOCK(inp); - return (0); + return (error); } if (sopt->sopt_level != IPPROTO_SCTP) { /* wrong proto level... send back up to IP */