Skip to contentSkip to conversation

netfilter: conntrack: nf_conncount_init is failing with IPv6 disabled

PATCH Applied Eelco Chaudron 3 participants 3 messages Sep 1, 2020 – Sep 8, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: conntrack: nf_conncount_init is failing with IPv6 disabled

The openvswitch module fails initialization when used in a kernel without IPv6 enabled. nf_conncount_init() fails because the ct code unconditionally tries to initialize the netns IPv6 related bit, regardless of the build option. The change below ignores the IPv6 part if not enabled.

Note that the corresponding _put() function already has this IPv6 configuration check.

Fixes 11efd5cb04a1 ("openvswitch: Support conntrack zone limit")
---
 net/netfilter/nf_conntrack_proto.c |    2 ++
 1 file changed, 2 insertions(+)
net/netfilter/nf_conntrack_proto.c +2 -0
index 95f79980348c..47e9319d2cf3 100644
@@ -565,6 +565,7 @@ static int nf_ct_netns_inet_get(struct net *net)
 	int err;
 
 	err = nf_ct_netns_do_get(net, NFPROTO_IPV4);
+#if IS_ENABLED(CONFIG_IPV6)
 	if (err < 0)
 		goto err1;
 	err = nf_ct_netns_do_get(net, NFPROTO_IPV6);
@@ -575,6 +576,7 @@ static int nf_ct_netns_inet_get(struct net *net)
 err2:
 	nf_ct_netns_put(net, NFPROTO_IPV4);
 err1:
+#endif
 	return err;
 }
 
Reviewed-by on v1 1/1
#1 lore raw

+ Pablo, [email protected]

Quoted 11 lines · Eelco Chaudron

The openvswitch module fails initialization when used in a kernel without IPv6 enabled. nf_conncount_init() fails because the ct code unconditionally tries to initialize the netns IPv6 related bit, regardless of the build option. The change below ignores the IPv6 part if not enabled.

Note that the corresponding _put() function already has this IPv6 configuration check.

Fixes 11efd5cb04a1 ("openvswitch: Support conntrack zone limit")
Quoted 25 lines
---
 net/netfilter/nf_conntrack_proto.c |    2 ++
 1 file changed, 2 insertions(+)
net/netfilter/nf_conntrack_proto.c +2 -0
index 95f79980348c..47e9319d2cf3 100644
@@ -565,6 +565,7 @@ static int nf_ct_netns_inet_get(struct net *net)
 	int err;
 
 	err = nf_ct_netns_do_get(net, NFPROTO_IPV4);
+#if IS_ENABLED(CONFIG_IPV6)
 	if (err < 0)
 		goto err1;
 	err = nf_ct_netns_do_get(net, NFPROTO_IPV6);
@@ -575,6 +576,7 @@ static int nf_ct_netns_inet_get(struct net *net)
 err2:
 	nf_ct_netns_put(net, NFPROTO_IPV4);
 err1:
+#endif
 	return err;
 }
 
maintainer Applied
#2 lore raw
In reply to Eelco Chaudron
Quoted 8 lines · Eelco Chaudron

The openvswitch module fails initialization when used in a kernel without IPv6 enabled. nf_conncount_init() fails because the ct code unconditionally tries to initialize the netns IPv6 related bit, regardless of the build option. The change below ignores the IPv6 part if not enabled.

Note that the corresponding _put() function already has this IPv6 configuration check.

Applied to nf.git

Please, Cc: [email protected] next time.

Thanks.