The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.9.x-ovz" and will appear
at https://src.openvz.org/scm/ovz/vzkernel.git
after rebase
------>
commit abee353cfe00fb79b7c114592cdd280afd40075e
Author: Cyrill Gorcunov <gorcu...@odin.com>
Date: Wed Dec 2 20:00:33 2015 +0400
ve/l2tp: Drop VE_FEATURE_PPP feature test
In PCS6 we allowed to use PPP inside a Container only if the Container had a
special feature - VE_FEATURE_PPP.
In Virtuozzo 7 we do allow l2tp control by default, so lets rip this code
out
otherwise there is a net leak (because net_generic with @pppol2tp_net_id
always
return nil and proc entry never released).
Signed-off-by: Cyrill Gorcunov <gorcu...@virtuozzo.com>
CC: Vladimir Davydov <vdavy...@virtuozzo.com>
CC: Konstantin Khorenko <khore...@virtuozzo.com>
khorenko@: note: at the moment CRIU does not support cpt/rst of PPP.
---
net/l2tp/l2tp_ppp.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 00d9627..a819c36 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1751,9 +1751,6 @@ static __net_init int pppol2tp_init_net(struct net *net)
struct proc_dir_entry *pde;
int err = 0;
- if (!(net->owner_ve->features & VE_FEATURE_PPP))
- return net_assign_generic(net, pppol2tp_net_id, NULL);
-
pde = proc_create("pppol2tp", S_IRUGO, net->proc_net,
&pppol2tp_proc_fops);
if (!pde) {
@@ -1767,12 +1764,6 @@ out:
static __net_exit void pppol2tp_exit_net(struct net *net)
{
- struct pppoe_net *pn;
-
- pn = net_generic(net, pppol2tp_net_id);
- if (!pn) /* no VE_FEATURE_PPP */
- return;
-
remove_proc_entry("pppol2tp", net->proc_net);
}
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
