Skip to content

Commit 8d43259

Browse files
JonathonReinhartdavem330
authored andcommitted
net: Only allow init netns to set default tcp cong to a restricted algo
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: 97684f0 ("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: 6670e15 ("tcp: Namespace-ify sysctl_tcp_default_congestion_control") Signed-off-by: Jonathon Reinhart <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1682d8d commit 8d43259

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/ipv4/tcp_cong.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,10 @@ int tcp_set_default_congestion_control(struct net *net, const char *name)
230230
ret = -ENOENT;
231231
} else if (!bpf_try_module_get(ca, ca->owner)) {
232232
ret = -EBUSY;
233+
} else if (!net_eq(net, &init_net) &&
234+
!(ca->flags & TCP_CONG_NON_RESTRICTED)) {
235+
/* Only init netns can set default to a restricted algorithm */
236+
ret = -EPERM;
233237
} else {
234238
prev = xchg(&net->ipv4.tcp_congestion_control, ca);
235239
if (prev)

0 commit comments

Comments
 (0)