diff options
| author | Florian Westphal <fw@strlen.de> | 2021-05-04 16:40:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-10 13:39:13 +0200 |
| commit | 39a909a9720dd5a7b423f97c3737541d0ef76c06 (patch) | |
| tree | eb501bb366298c5e9ab5d6c4e5fde375d0747e51 /net/netfilter | |
| parent | 46e65061793405766c8368738cb5ecf5eca6caf3 (diff) | |
| download | linux-stable-39a909a9720dd5a7b423f97c3737541d0ef76c06.tar.gz linux-stable-39a909a9720dd5a7b423f97c3737541d0ef76c06.tar.bz2 linux-stable-39a909a9720dd5a7b423f97c3737541d0ef76c06.zip | |
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>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 47e9319d2cf3..71892822bbf5 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -660,7 +660,7 @@ int nf_conntrack_proto_init(void) #if IS_ENABLED(CONFIG_IPV6) cleanup_sockopt: - nf_unregister_sockopt(&so_getorigdst6); + nf_unregister_sockopt(&so_getorigdst); #endif return ret; } |