[Devel] [PATCH RH8] net: export "net.netfilter.nf_conntrack_helper" sysctl for Container

Vasily Averin vvs at virtuozzo.com
Mon May 31 15:13:08 MSK 2021


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 <khorenko at virtuozzo.com>
(cherry picked from vz7 commit cfbc2e31e7fb6f6c31fc89ae1a6fbaa73b93c1fd)
Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 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 =
-- 
2.25.1



More information about the Devel mailing list