The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear
at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.32
------>
commit 7b8f5680ed38c896c38eefa1e383b414688080ee
Author: Stanislav Kinsburskiy <[email protected]>
Date: Mon May 24 16:20:35 2021 +0300
ve/nf_conntrack: expose "nf_conntrack_events*" in contaners
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 vz7 commit i8c5060468d64 ("ve/nf_conntrack: expose
"nf_conntrack_events*" in contaners"))
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 =
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
