evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipvs: Don't use current in proc_do_defense_mode

Browse source 
Instead store ipvs in extra2 so that proc_do_defense_mode can easily
find the ipvs that it's value is associated with.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:01:39 -05:00 • committed by Simon Horman
parent 1daea8ed16
commit 717e917ddf
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/netfilter/ipvs/ip_vs_ctl.c
View file

@ -1615,7 +1615,7 @@ static int
proc_do_defense_mode(struct ctl_table *table, int write, proc_do_defense_mode(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
struct net *net = current->nsproxy->net_ns; struct netns_ipvs *ipvs = table->extra2;
int *valp = table->data; int *valp = table->data;
int val = *valp; int val = *valp;
int rc; int rc;
@ -1626,7 +1626,7 @@ proc_do_defense_mode(struct ctl_table *table, int write,
/* Restore the correct value */ /* Restore the correct value */
*valp = val; *valp = val;
} else { } else {
update_defense_level(net_ipvs(net)); update_defense_level(ipvs);
} }
} }
return rc; return rc;
@ -3866,6 +3866,10 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
} else } else
tbl = vs_vars; tbl = vs_vars;
/* Initialize sysctl defaults */ /* Initialize sysctl defaults */
for (idx = 0; idx < ARRAY_SIZE(vs_vars); idx++) {
if (tbl[idx].proc_handler == proc_do_defense_mode)
tbl[idx].extra2 = ipvs;
}
idx = 0; idx = 0;
ipvs->sysctl_amemthresh = 1024; ipvs->sysctl_amemthresh = 1024;
tbl[idx++].data = &ipvs->sysctl_amemthresh; tbl[idx++].data = &ipvs->sysctl_amemthresh;