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.34
------>
commit 1813d188d3a3de55c2091f7bd892068d3a107b1f
Author: Vasily Averin <[email protected]>
Date: Wed Jun 2 19:48:06 2021 +0300
net: export "net.netfilter.nf_conntrack_helper" sysctl for Container
firewalld honors it and the sysctl data is stored on "net",
it's safe to provide it.
https://jira.sw.ru/browse/PSBM-99791
Signed-off-by: Konstantin Khorenko <[email protected]>
(cherry picked from vz7 commit cfbc2e31e7fb ("net: export
"net.netfilter.nf_conntrack_helper" sysctl for Container"))
Signed-off-by: Vasily Averin <[email protected]>
---
net/netfilter/nf_conntrack_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_helper.c
b/net/netfilter/nf_conntrack_helper.c
index 38695fbd0fa6..38f835e11420 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -67,7 +67,7 @@ static int nf_conntrack_helper_init_sysctl(struct net *net)
table[0].data = &net->ct.sysctl_auto_assign_helper;
/* 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.helper_sysctl_header =
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
