summaryrefslogtreecommitdiffstats
path: root/net/sysctl_net.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2016-07-16 15:22:55 -0500
committerEric W. Biederman <ebiederm@xmission.com>2016-08-08 09:17:16 -0500
commit13bcc6a2853435bb5dad368bcbaa9d2a5b9c0ac4 (patch)
tree3c852b1ed6545b504ea23f5353d3570f46316d16 /net/sysctl_net.c
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
downloadlinux-13bcc6a2853435bb5dad368bcbaa9d2a5b9c0ac4.tar.gz
linux-13bcc6a2853435bb5dad368bcbaa9d2a5b9c0ac4.tar.bz2
linux-13bcc6a2853435bb5dad368bcbaa9d2a5b9c0ac4.zip
sysctl: Stop implicitly passing current into sysctl_table_root.lookup
Passing nsproxy into sysctl_table_root.lookup was a premature optimization in attempt to avoid depending on current. The directory /proc/self/sys has not appeared and if and when it does this code will need to be reviewed closely and reworked anyway. So remove the premature optimization. Acked-by: Kees Cook <keescook@chromium.org> Acked-by: Serge Hallyn <serge@hallyn.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'net/sysctl_net.c')
-rw-r--r--net/sysctl_net.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 46a71c701e7c..ba9b5d1a31df 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -27,9 +27,9 @@
#endif
static struct ctl_table_set *
-net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces)
+net_ctl_header_lookup(struct ctl_table_root *root)
{
- return &namespaces->net_ns->sysctls;
+ return &current->nsproxy->net_ns->sysctls;
}
static int is_seen(struct ctl_table_set *set)