Skip to content

Commit 97684f0

Browse files
JonathonReinhartdavem330
authored andcommitted
net: Make tcp_allowed_congestion_control readonly in non-init netns
Currently, tcp_allowed_congestion_control is global and writable; writing to it in any net namespace will leak into all other net namespaces. tcp_available_congestion_control and tcp_allowed_congestion_control are the only sysctls in ipv4_net_table (the per-netns sysctl table) with a NULL data pointer; their handlers (proc_tcp_available_congestion_control and proc_allowed_congestion_control) have no other way of referencing a struct net. Thus, they operate globally. Because ipv4_net_table does not use designated initializers, there is no easy way to fix up this one "bad" table entry. However, the data pointer updating logic shouldn't be applied to NULL pointers anyway, so we instead force these entries to be read-only. These sysctls used to exist in ipv4_table (init-net only), but they were moved to the per-net ipv4_net_table, presumably without realizing that tcp_allowed_congestion_control was writable and thus introduced a leak. Because the intent of that commit was only to know (i.e. read) "which congestion algorithms are available or allowed", this read-only solution should be sufficient. The logic added in recent commit 31c4d2f: ("net: Ensure net namespace isolation of sysctls") does not and cannot check for NULL data pointers, because other table entries (e.g. /proc/sys/net/netfilter/nf_log/) have .data=NULL but use other methods (.extra2) to access the struct net. Fixes: 9cb8e04 ("net/ipv4/sysctl: show tcp_{allowed, available}_congestion_control in non-initial netns") Signed-off-by: Jonathon Reinhart <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 61aaa1a commit 97684f0

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

net/ipv4/sysctl_net_ipv4.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,9 +1378,19 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
13781378
if (!table)
13791379
goto err_alloc;
13801380

1381-
/* Update the variables to point into the current struct net */
1382-
for (i = 0; i < ARRAY_SIZE(ipv4_net_table) - 1; i++)
1383-
table[i].data += (void *)net - (void *)&init_net;
1381+
for (i = 0; i < ARRAY_SIZE(ipv4_net_table) - 1; i++) {
1382+
if (table[i].data) {
1383+
/* Update the variables to point into
1384+
* the current struct net
1385+
*/
1386+
table[i].data += (void *)net - (void *)&init_net;
1387+
} else {
1388+
/* Entries without data pointer are global;
1389+
* Make them read-only in non-init_net ns
1390+
*/
1391+
table[i].mode &= ~0222;
1392+
}
1393+
}
13841394
}
13851395

13861396
net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);

0 commit comments

Comments
 (0)