From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org
Subject: [PATCH net 1/5] netfilter: conntrack: unregister ipv4 sockopts on error unwind
Date: Thu, 27 May 2021 21:01:11 +0200 [thread overview]
Message-ID: <20210527190115.98503-2-pablo@netfilter.org> (raw)
In-Reply-To: <20210527190115.98503-1-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
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>
---
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 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;
}
--
2.30.2
next prev parent reply other threads:[~2021-05-27 19:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 19:01 [PATCH net 0/5] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2021-05-27 19:01 ` Pablo Neira Ayuso [this message]
2021-05-27 19:01 ` [PATCH net 2/5] netfilter: nf_tables: missing error reporting for not selected expressions Pablo Neira Ayuso
2021-05-27 19:01 ` [PATCH net 3/5] netfilter: nf_tables: extended netlink error reporting for chain type Pablo Neira Ayuso
2021-05-27 19:01 ` [PATCH net 4/5] netfilter: nf_tables: fix table flag updates Pablo Neira Ayuso
2021-05-27 19:01 ` [PATCH net 5/5] ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service Pablo Neira Ayuso
2021-05-27 23:00 ` [PATCH net 0/5] Netfilter/IPVS fixes for net Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210527190115.98503-2-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).