diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-15 22:02:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-18 20:30:55 -0500 |
| commit | 464dc801c76aa0db88e16e8f5f47c6879858b9b2 (patch) | |
| tree | cfaf0f43f4ce50669f07031ec42062b4c9a7f985 /net/ipv4/devinet.c | |
| parent | 73f7ef435934e952c1d70d83d69921ea5d1f6bd4 (diff) | |
net: Don't export sysctls to unprivileged users
In preparation for supporting the creation of network namespaces
by unprivileged users, modify all of the per net sysctl exports
and refuse to allow them to unprivileged users.
This makes it safe for unprivileged users in general to access
per net sysctls, and allows sysctls to be exported to unprivileged
users on an individual basis as they are deemed safe.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/devinet.c')
| -rw-r--r-- | net/ipv4/devinet.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index f6db227c1fd9..6e06e924ed99 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
| @@ -1815,6 +1815,10 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name, | |||
| 1815 | t->devinet_vars[i].extra2 = net; | 1815 | t->devinet_vars[i].extra2 = net; |
| 1816 | } | 1816 | } |
| 1817 | 1817 | ||
| 1818 | /* Don't export sysctls to unprivileged users */ | ||
| 1819 | if (net->user_ns != &init_user_ns) | ||
| 1820 | t->devinet_vars[0].procname = NULL; | ||
| 1821 | |||
| 1818 | snprintf(path, sizeof(path), "net/ipv4/conf/%s", dev_name); | 1822 | snprintf(path, sizeof(path), "net/ipv4/conf/%s", dev_name); |
| 1819 | 1823 | ||
| 1820 | t->sysctl_header = register_net_sysctl(net, path, t->devinet_vars); | 1824 | t->sysctl_header = register_net_sysctl(net, path, t->devinet_vars); |
| @@ -1900,6 +1904,10 @@ static __net_init int devinet_init_net(struct net *net) | |||
| 1900 | tbl[0].data = &all->data[IPV4_DEVCONF_FORWARDING - 1]; | 1904 | tbl[0].data = &all->data[IPV4_DEVCONF_FORWARDING - 1]; |
| 1901 | tbl[0].extra1 = all; | 1905 | tbl[0].extra1 = all; |
| 1902 | tbl[0].extra2 = net; | 1906 | tbl[0].extra2 = net; |
| 1907 | |||
| 1908 | /* Don't export sysctls to unprivileged users */ | ||
| 1909 | if (net->user_ns != &init_user_ns) | ||
| 1910 | tbl[0].procname = NULL; | ||
| 1903 | #endif | 1911 | #endif |
| 1904 | } | 1912 | } |
| 1905 | 1913 | ||