From: Stanislav Kinsburskiy <[email protected]> Series: This series brings to vz7 all the nf_conntrack sysctl's, which are available in vz6.
https://jira.sw.ru/browse/PSBM-40044 Signed-off-by: Stanislav Kinsburskiy <[email protected]> Reviewed-by: Kirill Tkhai <[email protected]> (cherry picked from commit 8c5060468d648ac40598759589a03bd39ea448d6) VZ 8 rebase part https://jira.sw.ru/browse/PSBM-127783 Signed-off-by: Alexander Mikhalitsyn <[email protected]> --- net/netfilter/nf_conntrack_ecache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c index 04fb99b518dd..533e2e502673 100644 --- a/net/netfilter/nf_conntrack_ecache.c +++ b/net/netfilter/nf_conntrack_ecache.c @@ -24,6 +24,7 @@ #include <linux/netdevice.h> #include <linux/slab.h> #include <linux/export.h> +#include <linux/ve.h> #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h> @@ -369,7 +370,7 @@ static int nf_conntrack_event_init_sysctl(struct net *net) table[0].data = &net->ct.sysctl_events; /* Don't export sysctls to unprivileged users */ - if (net->user_ns != &init_user_ns) + if (ve_net_hide_sysctl(net)) table[0].procname = NULL; net->ct.event_sysctl_header = -- 2.28.0 _______________________________________________ Devel mailing list [email protected] https://lists.openvz.org/mailman/listinfo/devel
