From nobody Fri Feb 21 01:57:21 2025 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 4YzYD14LY9z5nmSt; Fri, 21 Feb 2025 01:57:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzYD12myVz3ns8; Fri, 21 Feb 2025 01:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740103041; 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=kTnf+fmWjd+mBdvfCCI2wDGoq45okjZu3Y3CcSI6oxo=; b=rDRYBUm+t/etVdhLyu2iJNnLWT1BiL2OtZHXHfpyoAmO0gCL1J6t5TrEJh4ZsSrVZEtwBh kZEIotGeYw6fx0oX3cZ9dgMo7g6umjv3V3CiNaL5fjdXozV+vh+6hVpxVY63Gfqf6n1zQz lj9B+fhS/nQ0AeAffECUYT/tHJFYXj2gMOt/U+EHs9ZT9t+Q5ma7XO9XZ1nj8qTXQvkX2F F/ZBbxEHJplQ8QOVmsWlp6HjgIHQF4CPlrZ7L9lXw0HfnEFv2HM5S1rcidW4xCEhyDZvMu u5ngSB+vEn9wMYgmqIyDPhSd8drWOFEG3vhK7tek9o/C8sRdFMDzgFf+/ZzwIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740103041; a=rsa-sha256; cv=none; b=LPjpB39PHM6FalR81kvVeqWcJk7ndtbTT4isDFTWRj7V+Io57u3D+ZNZKkwABXM6HbiQRB anXZHAmIB7Su2lQDkeBsqRxWoUkk3BM29BhaYjUKTZ/cKQCzZldjnlYNvMCLUp8Ji9LWUN Bk1FNwBkz/UsPYhN1Tv3M5GkFe2vm7H/fzUUr75Wa7kL/c0TuStDc9hARUIItOb9Gnu4/t 5zZam8GGgh0E/8ltozldqrO0y5go4IWsfP+9+oU0q8xZU7HR6F48gfrTt/0Koc4rzjfcE9 aAXCIQvy94YTTFYtlytfUf+yyAAcQ2+bXeAKdziNujEEcYQiYC1vQ246SaQ7DA== 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=1740103041; 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=kTnf+fmWjd+mBdvfCCI2wDGoq45okjZu3Y3CcSI6oxo=; b=jWY2XB6li9gEgAI+TY7qnOKc8Vgoso7qfZ28D6gCGX6AJqpdJHzvA4S7VEv09gdW/o80kw aYKV93v+aLZHMcGOkFisrGDtAmi/izi7AyOKuR/+m5RU6W3uZeXsoVOn+RsXl9PphthXQM Cg2qvaze5jRNsepNxlQaf00w7QmZ67ijkXw1BReR06qybXq0mKrCzGelkwMgSvpl6/z9F0 Xavf7hANrVGwRz5U/KUwEPmOwQovhBjE4pMUAOuEMz8iUlghg0DpxeyXbsmjfmuc4tOlDm SrxfQwkfV5/hkic4T8SY8x6Uu8e5q/HVW3sdD73khna/UKq8YHB++nqi3H8x5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YzYD12MBtz1Gtd; Fri, 21 Feb 2025 01:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51L1vLrl067556; Fri, 21 Feb 2025 01:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51L1vLow067553; Fri, 21 Feb 2025 01:57:21 GMT (envelope-from git) Date: Fri, 21 Feb 2025 01:57:21 GMT Message-Id: <202502210157.51L1vLow067553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a55bde2328e5 - stable/14 - socket: Move SO_SETFIB handling to protocol layers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a55bde2328e53b718faa68d00479b9652dbe44ad Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a55bde2328e53b718faa68d00479b9652dbe44ad commit a55bde2328e53b718faa68d00479b9652dbe44ad Author: Mark Johnston AuthorDate: 2025-02-06 14:16:21 +0000 Commit: Mark Johnston CommitDate: 2025-02-21 01:04:50 +0000 socket: Move SO_SETFIB handling to protocol layers In particular, we store a FIB number in both struct socket and in struct inpcb. When updating the FIB number with setsockopt(SO_SETFIB), make the update atomic. This is required to support the new bind_all_fibs mode, since in that mode changing the FIB of a bound socket is not permitted. This requires a bit more code, but avoids a layering violation in sosetopt(), where we hard-code the list of protocol families that implement SO_SETFIB. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D48666 (cherry picked from commit caccbaef8e263b1d769e7bcac1c4617bdc12d484) --- sys/kern/uipc_socket.c | 29 ++++++++++++++--------------- sys/net/rtsock.c | 25 +++++++++++++++++++++++++ sys/netinet/ip_output.c | 16 ++++++++++++++-- sys/netinet/raw_ip.c | 11 ++++------- sys/netinet6/ip6_output.c | 16 ++++++++++++++-- sys/netinet6/raw_ip6.c | 11 ++++------- sys/sys/socketvar.h | 1 + 7 files changed, 76 insertions(+), 33 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index fcec1ef166fc..58090b28fcc8 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3698,6 +3698,19 @@ sorflush(struct socket *so) } +int +sosetfib(struct socket *so, int fibnum) +{ + if (fibnum < 0 || fibnum >= rt_numfibs) + return (EINVAL); + + SOCK_LOCK(so); + so->so_fibnum = fibnum; + SOCK_UNLOCK(so); + + return (0); +} + /* * Wrapper for Socket established helper hook. * Parameters: socket, context of the hook point, hook id. @@ -3844,21 +3857,7 @@ sosetopt(struct socket *so, struct sockopt *sopt) break; case SO_SETFIB: - error = sooptcopyin(sopt, &optval, sizeof optval, - sizeof optval); - if (error) - goto bad; - - if (optval < 0 || optval >= rt_numfibs) { - error = EINVAL; - goto bad; - } - if (((so->so_proto->pr_domain->dom_family == PF_INET) || - (so->so_proto->pr_domain->dom_family == PF_INET6) || - (so->so_proto->pr_domain->dom_family == PF_ROUTE))) - so->so_fibnum = optval; - else - so->so_fibnum = 0; + error = so->so_proto->pr_ctloutput(so, sopt); break; case SO_USER_COOKIE: diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 4678edeb06d5..8b4e716a0508 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -425,6 +425,30 @@ rts_attach(struct socket *so, int proto, struct thread *td) return (0); } +static int +rts_ctloutput(struct socket *so, struct sockopt *sopt) +{ + int error, optval; + + error = ENOPROTOOPT; + if (sopt->sopt_dir == SOPT_SET) { + switch (sopt->sopt_level) { + case SOL_SOCKET: + switch (sopt->sopt_name) { + case SO_SETFIB: + error = sooptcopyin(sopt, &optval, + sizeof(optval), sizeof(optval)); + if (error != 0) + break; + error = sosetfib(so, optval); + break; + } + break; + } + } + return (error); +} + static void rts_detach(struct socket *so) { @@ -2687,6 +2711,7 @@ static struct protosw routesw = { .pr_flags = PR_ATOMIC|PR_ADDR, .pr_abort = rts_close, .pr_attach = rts_attach, + .pr_ctloutput = rts_ctloutput, .pr_detach = rts_detach, .pr_send = rts_send, .pr_shutdown = rts_shutdown, diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 892a54eb628d..e798431397f7 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1100,10 +1100,22 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) sopt->sopt_dir == SOPT_SET) { switch (sopt->sopt_name) { case SO_SETFIB: + error = sooptcopyin(sopt, &optval, + sizeof(optval), sizeof(optval)); + if (error != 0) + break; + INP_WLOCK(inp); - inp->inp_inc.inc_fibnum = so->so_fibnum; + if ((inp->inp_flags & INP_BOUNDFIB) != 0 && + optval != so->so_fibnum) { + INP_WUNLOCK(inp); + error = EISCONN; + break; + } + error = sosetfib(inp->inp_socket, optval); + if (error == 0) + inp->inp_inc.inc_fibnum = optval; INP_WUNLOCK(inp); - error = 0; break; case SO_MAX_PACING_RATE: #ifdef RATELIMIT diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index c30878d48c74..287a806845c4 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -635,13 +635,10 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt) int error, optval; if (sopt->sopt_level != IPPROTO_IP) { - if ((sopt->sopt_level == SOL_SOCKET) && - (sopt->sopt_name == SO_SETFIB)) { - INP_WLOCK(inp); - inp->inp_inc.inc_fibnum = so->so_fibnum; - INP_WUNLOCK(inp); - return (0); - } + if (sopt->sopt_dir == SOPT_SET && + sopt->sopt_level == SOL_SOCKET && + sopt->sopt_name == SO_SETFIB) + return (ip_ctloutput(so, sopt)); return (EINVAL); } diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index d98d7c5aa928..afc8b60e4cbe 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1658,10 +1658,22 @@ ip6_ctloutput(struct socket *so, struct sockopt *sopt) sopt->sopt_dir == SOPT_SET) { switch (sopt->sopt_name) { case SO_SETFIB: + error = sooptcopyin(sopt, &optval, + sizeof(optval), sizeof(optval)); + if (error != 0) + break; + INP_WLOCK(inp); - inp->inp_inc.inc_fibnum = so->so_fibnum; + if ((inp->inp_flags & INP_BOUNDFIB) != 0 && + optval != so->so_fibnum) { + INP_WUNLOCK(inp); + error = EISCONN; + break; + } + error = sosetfib(inp->inp_socket, optval); + if (error == 0) + inp->inp_inc.inc_fibnum = optval; INP_WUNLOCK(inp); - error = 0; break; case SO_MAX_PACING_RATE: #ifdef RATELIMIT diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 66fe0afbe918..803dc3c1804e 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -578,13 +578,10 @@ rip6_ctloutput(struct socket *so, struct sockopt *sopt) */ return (icmp6_ctloutput(so, sopt)); else if (sopt->sopt_level != IPPROTO_IPV6) { - if (sopt->sopt_level == SOL_SOCKET && - sopt->sopt_name == SO_SETFIB) { - INP_WLOCK(inp); - inp->inp_inc.inc_fibnum = so->so_fibnum; - INP_WUNLOCK(inp); - return (0); - } + if (sopt->sopt_dir == SOPT_SET && + sopt->sopt_level == SOL_SOCKET && + sopt->sopt_name == SO_SETFIB) + return (ip6_ctloutput(so, sopt)); return (EINVAL); } diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index b60c8726833b..f7b23d239157 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -555,6 +555,7 @@ int sosend_dgram(struct socket *so, struct sockaddr *addr, int sosend_generic(struct socket *so, struct sockaddr *addr, struct uio *uio, struct mbuf *top, struct mbuf *control, int flags, struct thread *td); +int sosetfib(struct socket *so, int fibnum); int soshutdown(struct socket *so, int how); void soupcall_clear(struct socket *, sb_which); void soupcall_set(struct socket *, sb_which, so_upcall_t, void *);