diff options
| author |   Florian Westphal <fw@strlen.de> | 2021-05-04 16:40:00 +0200 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2021-05-20 00:01:11 +0200 |
| commit | 22cbdbcfb61acc78d5fc21ebb13ccc0d7e29f793 (patch) | |
| tree | 7333ee4f93d5fbe0dbe50281885f5a2826da005a /net/netfilter/nf_conntrack_proto.c | |
| parent | tipc: wait and exit until all work queues are done (diff) | |
| download | linux-dev-22cbdbcfb61acc78d5fc21ebb13ccc0d7e29f793.tar.xz linux-dev-22cbdbcfb61acc78d5fc21ebb13ccc0d7e29f793.zip | |
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>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto.c')
| -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 89e5bac384d7..dc9ca12b0489 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; } |