From: Florian Westphal <fw@strlen.de>
Date: Tue, 4 May 2021 14:40:00 +0000 (+0200)
Subject: netfilter: conntrack: unregister ipv4 sockopts on error unwind
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=22cbdbcfb61acc78d5fc21ebb13ccc0d7e29f793;p=linux.git

netfilter: conntrack: unregister ipv4 sockopts on error unwind

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>
---

diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
index 89e5bac384d70..dc9ca12b0489c 100644
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -664,7 +664,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;
 }