netfilter: conntrack: unregister ipv4 sockopts on error unwind
authorFlorian Westphal <fw@strlen.de>
Tue, 4 May 2021 14:40:00 +0000 (16:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Jun 2021 11:39:13 +0000 (13:39 +0200)
commit39a909a9720dd5a7b423f97c3737541d0ef76c06
treeeb501bb366298c5e9ab5d6c4e5fde375d0747e51
parent46e65061793405766c8368738cb5ecf5eca6caf3
netfilter: conntrack: unregister ipv4 sockopts on error unwind

[ Upstream commit 22cbdbcfb61acc78d5fc21ebb13ccc0d7e29f793 ]

When ipv6 sockopt register fails, the ipv4 one needs to be removed.

Fixes: a0ae2562c6c ("netfilter: conntrack: remove l3proto abstraction")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/netfilter/nf_conntrack_proto.c