| From 360c3188d641c19800259c6fd357440eae1566dc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 4 May 2021 16:40:00 +0200 |
| Subject: netfilter: conntrack: unregister ipv4 sockopts on error unwind |
| |
| From: Florian Westphal <fw@strlen.de> |
| |
| [ 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c |
| index aaf4293ddd45..75e6b429635d 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; |
| } |
| -- |
| 2.30.2 |
| |
