tcp_memcontrol: Remove setting cgroup settings via sysctl

The code is broken and does not constrain sysctl_tcp_mem as
tcp_update_limit does.  With the result that it allows the cgroup tcp
memory limits to be bypassed.

The semantics are broken as the settings are not per netns and are in a
per netns table, and instead looks at current.

Since the code is broken in both design and implementation and does not
implement the functionality for which it was written remove it.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 37 deletions

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 4b161d5aba0b..8457f7bc4d89 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -204,43 +204,8 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write,
                            void __user *buffer, size_t *lenp,
                            loff_t *ppos)
 {
-        int ret;
-        unsigned long vec[3];
-        struct net *net = current->nsproxy->net_ns;
-#ifdef CONFIG_MEMCG_KMEM
-        struct mem_cgroup *memcg;
-#endif
-
-        struct ctl_table tmp = {
-                .data = &vec,
-                .maxlen = sizeof(vec),
-                .mode = ctl->mode,
-        };
-
-        if (!write) {
-                ctl->data = &net->ipv4.sysctl_tcp_mem;
-                return proc_doulongvec_minmax(ctl, write, buffer, lenp, ppos);
-        }
-
-        ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos);
-        if (ret)
-                return ret;
-
-#ifdef CONFIG_MEMCG_KMEM
-        rcu_read_lock();
-        memcg = mem_cgroup_from_task(current);
-
-        tcp_prot_mem(memcg, vec[0], 0);
-        tcp_prot_mem(memcg, vec[1], 1);
-        tcp_prot_mem(memcg, vec[2], 2);
-        rcu_read_unlock();
-#endif
-
-        net->ipv4.sysctl_tcp_mem[0] = vec[0];
-        net->ipv4.sysctl_tcp_mem[1] = vec[1];
-        net->ipv4.sysctl_tcp_mem[2] = vec[2];
-
-        return 0;
+        ctl->data = &current->nsproxy->net_ns->ipv4.sysctl_tcp_mem;
+        return proc_doulongvec_minmax(ctl, write, buffer, lenp, ppos);
 }
 
 static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,