From nobody Mon Oct 26 19:19:04 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 4jD3MX2dk5z6xSy2 for ; Mon, 26 Oct 2026 19:19:04 +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 4jD3MX24xPz4kd0 for ; Mon, 26 Oct 2026 19:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793042344; 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=3K2MKWnYet9or3YH/gvgqkE+BQiuUfItuBUD5BaAuYM=; b=q/iou8BNwpTb/Ar6vJdrd7HSCkVm3f0gnAAQ1ez8wQ7X3h0CaARwTdP+WaEZfUhnhVr0Ll 4Bm1K2ocqrYCfk0KwHxH6pdBolCE1kkqu+onFxz8SdUqw3PoJ0L5tvyCPXgeXVLOhDYrvd VhQkZrumvku1OcxC8iy/Q7l3BanO5tVzwHqxq51zBGYoSJ9MgvAAgTyHFrA/BgJXXqgwsl WarDctsprBuaK15WGaw15HtLBHEhG4zG/E5HY00bsuNHBVzX+c2LQf/5BWWIGHuVekYikJ ark6/snYH0UgBI1NoiPMBdNhz7h1FK11NXKfoYXZmY9BcdXaQJ3DoIK/xot6Rg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793042344; b=X0+X2hr0cQvcopZ1AA8FmsrWwzylA+FMN2B8sRIQMtW4KIUNOXQ3rcyzl4SiyllOXM5lLR dAGOt/4l2kF8R3fzc3d86MTFhBnZzhyLdpVVTAyUI9d1ouIjPjYGSF69Y6OaigRBWlfoaC mjSsP0gQ4C9jOEjJujfy4fqNh+QMbzeGdNbz3ddrQUoAy84wO1BvH25oRT/ShWcwN+EYBa f6J8iTLyIfqtQsj1GCP4UQe8AALbEYqrarlMo/Sd8Fi0R0Q+PiNJDO1K2a3ZIssnQzv8mh QwcIMEqE6cWjKpDIX6h1ctATTl9EFeMJ1Oj6EfVWx2X1FPFKfifdtOB3wgTd9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793042344; 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=3K2MKWnYet9or3YH/gvgqkE+BQiuUfItuBUD5BaAuYM=; b=Ai3BkbJjqK0GDob5LPwcmJz6ZYro7DM6OeNGVbNkrgQzpt1PtO7oBQ/bCXxsB3COMLbmXn oaiBxv2H3+6h7OdlQWRSZuU6lSmCJl+0snXodIxPl8Ys7nOPBIwb5HEicm0Og8MB3j5CVo ssW/MpQuvkA37I7d+7+jSfAL5e8SPM9YW8RimhRqWJREc8ibtobcCHQ4MXWzJpQGu07+4k WUrD9gdOnJDPIp86D3GSxQpZlWgCEB7IBuq9hfD4PI6UXbKOxHxtx7eVo09nDNhVg5MP2J 6tFF0ru2f7nIufUAy2EVWcDGlGQn/XVs7gbleJc7LvMS+X3YO4wvM7DyNqnMkQ== 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 4jD3MX1h5Wzncf for ; Mon, 26 Oct 2026 19:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36388 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 19:19:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Albin Hellqvist From: Michael Tuexen Subject: git: 7b8151b0cd1b - main - sctp: improve handling of SO_SETFIB socket option List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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/main X-Git-Reftype: branch X-Git-Commit: 7b8151b0cd1b4f077b382b6be2c02c936d1988fa Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 19:19:04 +0000 Message-Id: <6adfa7a8.36388.737228bd@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7b8151b0cd1b4f077b382b6be2c02c936d1988fa commit 7b8151b0cd1b4f077b382b6be2c02c936d1988fa Author: Albin Hellqvist AuthorDate: 2026-10-26 19:07:03 +0000 Commit: Michael Tuexen CommitDate: 2026-10-26 19:07:03 +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") MFC after: 3 days MFC to: stable/14 MFC to: stable/15 --- 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 4345c0cc6326..1c53d07b9e6c 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -6877,15 +6877,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 */