From nobody Thu Oct 29 06:59:42 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 4jFZq24PKPz6xvx1 for ; Thu, 29 Oct 2026 06:59:42 +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 4jFZq23Qtxz4KTB for ; Thu, 29 Oct 2026 06:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793257182; 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=1FL8MNth3XHq9llJjpfib4A92HbTK+ObyA84i0Dkiiw=; b=c0XyWSJYO5jYCagF0hx+R+QD5AGr9wgtzbo5qtWbC3gc88rOd2HT1cMJIoPFBOFkF4ujWK OD2Auz2PL6Q2+i0EyuDGgsW/iRguSUgagTstaDttAbMdHCl9DU0sTIq/cYh0OXRcunThnc ncnCStDGDPC4EiSw1rX86eRbd99WKZ/ClU9HXeFtW2NcUUF5QzZhn2YJ0TX5WoQ6NNhQ3z pdXJiQC2HSOj8YjEJwAJe7+4urD3wuAfwh+f9qvodF5Psaa+yaQW3UJ22krkxV02VDgI+7 6upb/8qCUD58RpWrsNa7D6YosiMSrWmYSz442y80G7XoPH2C6UIYhwW056wjVQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793257182; b=ZAkCgkFj8BdnHqb7zG0TdCEBCCnij85Cyji1xSwIORWm/gwrQs3U1THkkx+FtWU5OlMDiM bzgz7tEBUCJJA1pRx2jC8hKmuu98AyGxJoUbY1iULdv08G3cuc//NX9CMjs/CpVUxA1/oj w2dCjqKRMWbW+phL4XtsCtyNluxrmBQSYgo8zbP2+Rx31olJiInyOhXZN3lGYdKfZ7oMHV rdsnKbUxQRVn2kG6wi70VPdIHBXQrMp++lHoNOIb3SDI79nHNE77NkwC+wojdE23QS5Zbo PnFFwWmDa9zaoHg723VTpVUmcAQ5VseuOgeP3/Y5NzbzvDOlvDdK2Y4/pKQPbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793257182; 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=1FL8MNth3XHq9llJjpfib4A92HbTK+ObyA84i0Dkiiw=; b=UYDdbzfJIOk4ropTo78PxT7HqLo2AEfQrGWcsLPfmrZGr5QjSDI+Q+0vXthOCbBjqE6YuH IF8A59c1I0PHWn2u0oD3AyvTNqIwg/xyAbvq2WNHlc141j0NuRSODePrB8/5fV0eRCfR73 wXD/BZSKkwU5EWIyeHJh5LmQb+PuHaOkNVX0H1rtrkzaoeCf00GX+qqif3rnTa1DFFOthY UsPz9z8saJ8K3MMg2BG4xo/6C3+/J1bsyzRgAvn3cmfnWPuL1rB/Egk26ICa4lM1x+96od wglUku2wO2DuOaKfnopK1PVgE7Gd9LRWLbsUr+04+jNpRfRQLJJJ+OAissozrg== 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 4jFZq22qkqzSb0 for ; Thu, 29 Oct 2026 06:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:59:42 +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: 5ad9c6b31504 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 5ad9c6b31504160a487756ba8b7620192da56571 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:59:42 +0000 Message-Id: <6ae2eede.3fd0f.3e343deb@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5ad9c6b31504160a487756ba8b7620192da56571 commit 5ad9c6b31504160a487756ba8b7620192da56571 Author: Albin Hellqvist AuthorDate: 2026-10-26 19:07:03 +0000 Commit: Michael Tuexen CommitDate: 2026-10-29 05:54:19 +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 1d062144d322..fe5310f48d8d 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -6875,15 +6875,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 */