Skip to content

Commit 31c4d2f

Browse files
JonathonReinhartdavem330
authored andcommitted
net: Ensure net namespace isolation of sysctls
This adds an ensure_safe_net_sysctl() check during register_net_sysctl() to validate that sysctl table entries for a non-init_net netns are sufficiently isolated. To be netns-safe, an entry must adhere to at least (and usually exactly) one of these rules: 1. It is marked read-only inside the netns. 2. Its data pointer does not point to kernel/module global data. An entry which fails both of these checks is indicative of a bug, whereby a child netns can affect global net sysctl values. If such an entry is found, this code will issue a warning to the kernel log, and force the entry to be read-only to prevent a leak. To test, simply create a new netns: $ sudo ip netns add dummy As it sits now, this patch will WARN for two sysctls which will be addressed in a subsequent patch: - /proc/sys/net/netfilter/nf_conntrack_max - /proc/sys/net/netfilter/nf_conntrack_expect_max Signed-off-by: Jonathon Reinhart <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a115d24 commit 31c4d2f

File tree

1 file changed

+48
-0
lines changed

1 file changed

+48
-0
lines changed

net/sysctl_net.c

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,57 @@ __init int net_sysctl_init(void)
115115
goto out;
116116
}
117117

118+
/* Verify that sysctls for non-init netns are safe by either:
119+
* 1) being read-only, or
120+
* 2) having a data pointer which points outside of the global kernel/module
121+
* data segment, and rather into the heap where a per-net object was
122+
* allocated.
123+
*/
124+
static void ensure_safe_net_sysctl(struct net *net, const char *path,
125+
struct ctl_table *table)
126+
{
127+
struct ctl_table *ent;
128+
129+
pr_debug("Registering net sysctl (net %p): %s\n", net, path);
130+
for (ent = table; ent->procname; ent++) {
131+
unsigned long addr;
132+
const char *where;
133+
134+
pr_debug(" procname=%s mode=%o proc_handler=%ps data=%p\n",
135+
ent->procname, ent->mode, ent->proc_handler, ent->data);
136+
137+
/* If it's not writable inside the netns, then it can't hurt. */
138+
if ((ent->mode & 0222) == 0) {
139+
pr_debug(" Not writable by anyone\n");
140+
continue;
141+
}
142+
143+
/* Where does data point? */
144+
addr = (unsigned long)ent->data;
145+
if (is_module_address(addr))
146+
where = "module";
147+
else if (core_kernel_data(addr))
148+
where = "kernel";
149+
else
150+
continue;
151+
152+
/* If it is writable and points to kernel/module global
153+
* data, then it's probably a netns leak.
154+
*/
155+
WARN(1, "sysctl %s/%s: data points to %s global data: %ps\n",
156+
path, ent->procname, where, ent->data);
157+
158+
/* Make it "safe" by dropping writable perms */
159+
ent->mode &= ~0222;
160+
}
161+
}
162+
118163
struct ctl_table_header *register_net_sysctl(struct net *net,
119164
const char *path, struct ctl_table *table)
120165
{
166+
if (!net_eq(net, &init_net))
167+
ensure_safe_net_sysctl(net, path, table);
168+
121169
return __register_sysctl_table(&net->sysctls, path, table);
122170
}
123171
EXPORT_SYMBOL_GPL(register_net_sysctl);

0 commit comments

Comments
 (0)