Netdev Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] net: Only allow init netns to set default tcp cong to a restricted algo
@ 2021-05-01  8:28 Jonathon Reinhart
  2021-05-01  8:50 ` Jonathon Reinhart
  2021-05-04 19:10 ` patchwork-bot+netdevbpf
  0 siblings, 2 replies; 3+ messages in thread
From: Jonathon Reinhart @ 2021-05-01  8:28 UTC (permalink / raw)
  To: netdev
  Cc: Jonathon Reinhart, Eric Dumazet, David S. Miller,
	Hideaki YOSHIFUJI, David Ahern, Jakub Kicinski,
	Stephen Hemminger

tcp_set_default_congestion_control() is netns-safe in that it writes
to &net->ipv4.tcp_congestion_control, but it also sets
ca->flags |= TCP_CONG_NON_RESTRICTED which is not namespaced.
This has the unintended side-effect of changing the global
net.ipv4.tcp_allowed_congestion_control sysctl, despite the fact that it
is read-only: 97684f0970f6 ("net: Make tcp_allowed_congestion_control
readonly in non-init netns")

Resolve this netns "leak" by only allowing the init netns to set the
default algorithm to one that is restricted. This restriction could be
removed if tcp_allowed_congestion_control were namespace-ified in the
future.

This bug was uncovered with
https://github.com/JonathonReinhart/linux-netns-sysctl-verify

Fixes: 6670e1524477 ("tcp: Namespace-ify sysctl_tcp_default_congestion_control")
Signed-off-by: Jonathon Reinhart <jonathon.reinhart@gmail.com>
---
 net/ipv4/tcp_cong.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index 563d016e7478..db5831e6c136 100644
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -230,6 +230,10 @@ int tcp_set_default_congestion_control(struct net *net, const char *name)
 		ret = -ENOENT;
 	} else if (!bpf_try_module_get(ca, ca->owner)) {
 		ret = -EBUSY;
+	} else if (!net_eq(net, &init_net) &&
+			!(ca->flags & TCP_CONG_NON_RESTRICTED)) {
+		/* Only init netns can set default to a restricted algorithm */
+		ret = -EPERM;
 	} else {
 		prev = xchg(&net->ipv4.tcp_congestion_control, ca);
 		if (prev)
-- 
2.20.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] net: Only allow init netns to set default tcp cong to a restricted algo
  2021-05-01  8:28 [PATCH] net: Only allow init netns to set default tcp cong to a restricted algo Jonathon Reinhart
@ 2021-05-01  8:50 ` Jonathon Reinhart
  2021-05-04 19:10 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: Jonathon Reinhart @ 2021-05-01  8:50 UTC (permalink / raw)
  To: Linux Netdev List
  Cc: Eric Dumazet, David S. Miller, Hideaki YOSHIFUJI, David Ahern,
	Jakub Kicinski, Stephen Hemminger

On Sat, May 1, 2021 at 4:29 AM Jonathon Reinhart
<jonathon.reinhart@gmail.com> wrote:
>
> tcp_set_default_congestion_control() is netns-safe in that it writes
> to &net->ipv4.tcp_congestion_control, but it also sets
> ca->flags |= TCP_CONG_NON_RESTRICTED which is not namespaced.
> This has the unintended side-effect of changing the global
> net.ipv4.tcp_allowed_congestion_control sysctl, despite the fact that it
> is read-only: 97684f0970f6 ("net: Make tcp_allowed_congestion_control
> readonly in non-init netns")
>
> Resolve this netns "leak" by only allowing the init netns to set the
> default algorithm to one that is restricted. This restriction could be
> removed if tcp_allowed_congestion_control were namespace-ified in the
> future.
>
> This bug was uncovered with
> https://github.com/JonathonReinhart/linux-netns-sysctl-verify
>
> Fixes: 6670e1524477 ("tcp: Namespace-ify sysctl_tcp_default_congestion_control")
> Signed-off-by: Jonathon Reinhart <jonathon.reinhart@gmail.com>
> ---
>  net/ipv4/tcp_cong.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
> index 563d016e7478..db5831e6c136 100644
> --- a/net/ipv4/tcp_cong.c
> +++ b/net/ipv4/tcp_cong.c
> @@ -230,6 +230,10 @@ int tcp_set_default_congestion_control(struct net *net, const char *name)
>                 ret = -ENOENT;
>         } else if (!bpf_try_module_get(ca, ca->owner)) {
>                 ret = -EBUSY;
> +       } else if (!net_eq(net, &init_net) &&
> +                       !(ca->flags & TCP_CONG_NON_RESTRICTED)) {
> +               /* Only init netns can set default to a restricted algorithm */
> +               ret = -EPERM;
>         } else {
>                 prev = xchg(&net->ipv4.tcp_congestion_control, ca);
>                 if (prev)
> --
> 2.20.1
>

This should be targeting "net" (and stable), not "net-next". Sorry about that.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] net: Only allow init netns to set default tcp cong to a restricted algo
  2021-05-01  8:28 [PATCH] net: Only allow init netns to set default tcp cong to a restricted algo Jonathon Reinhart
  2021-05-01  8:50 ` Jonathon Reinhart
@ 2021-05-04 19:10 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-05-04 19:10 UTC (permalink / raw)
  To: Jonathon Reinhart
  Cc: netdev, edumazet, davem, yoshfuji, dsahern, kuba, stephen

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Sat,  1 May 2021 04:28:22 -0400 you wrote:
> tcp_set_default_congestion_control() is netns-safe in that it writes
> to &net->ipv4.tcp_congestion_control, but it also sets
> ca->flags |= TCP_CONG_NON_RESTRICTED which is not namespaced.
> This has the unintended side-effect of changing the global
> net.ipv4.tcp_allowed_congestion_control sysctl, despite the fact that it
> is read-only: 97684f0970f6 ("net: Make tcp_allowed_congestion_control
> readonly in non-init netns")
> 
> [...]

Here is the summary with links:
  - net: Only allow init netns to set default tcp cong to a restricted algo
    https://git.kernel.org/netdev/net/c/8d432592f30f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-01  8:28 [PATCH] net: Only allow init netns to set default tcp cong to a restricted algo Jonathon Reinhart
2021-05-01  8:50 ` Jonathon Reinhart
2021-05-04 19:10 ` patchwork-bot+netdevbpf

Netdev Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/netdev/0 netdev/git/0.git
	git clone --mirror https://lore.kernel.org/netdev/1 netdev/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 netdev netdev/ https://lore.kernel.org/netdev \
		netdev@vger.kernel.org
	public-inbox-index netdev

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.netdev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git