netfilter: conntrack: nf_conncount_init is failing with IPv6 disabled
authorEelco Chaudron <echaudro@redhat.com>
Tue, 1 Sep 2020 14:56:02 +0000 (16:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 15:36:27 +0000 (17:36 +0200)
commitb47342e6341d706844b9cb2ce436f2eb80601543
tree13093679445bbc7803f202dd7e89dcb22e093035
parente38f49e00baf15d6eae9377647e15fc0962cf8cb
netfilter: conntrack: nf_conncount_init is failing with IPv6 disabled

[ Upstream commit 526e81b990e53e31ba40ba304a2285ffd098721f ]

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")
Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/netfilter/nf_conntrack_proto.c