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: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency
Date: Tue, 22 Feb 2022 08:33:08 +0100 [thread overview]
Message-ID: <20220222073312.308406-2-pablo@netfilter.org> (raw)
In-Reply-To: <20220222073312.308406-1-pablo@netfilter.org>
nf_defrag_ipv6_disable() requires CONFIG_IP6_NF_IPTABLES.
Fixes: 75063c9294fb ("netfilter: xt_socket: fix a typo in socket_mt_destroy()")
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Eric Dumazet<edumazet@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/xt_socket.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
index 662e5eb1cc39..7013f55f05d1 100644
--- a/net/netfilter/xt_socket.c
+++ b/net/netfilter/xt_socket.c
@@ -220,8 +220,10 @@ static void socket_mt_destroy(const struct xt_mtdtor_param *par)
{
if (par->family == NFPROTO_IPV4)
nf_defrag_ipv4_disable(par->net);
+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
else if (par->family == NFPROTO_IPV6)
nf_defrag_ipv6_disable(par->net);
+#endif
}
static struct xt_match socket_mt_reg[] __read_mostly = {
--
2.30.2
next prev parent reply other threads:[~2022-02-22 7:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 7:33 [PATCH net 0/5,v2] Netfilter fixes for net Pablo Neira Ayuso
2022-02-22 7:33 ` Pablo Neira Ayuso [this message]
2022-02-22 7:33 ` [PATCH net 2/5] netfilter: nf_tables_offload: incorrect flow offload action array size Pablo Neira Ayuso
2022-02-22 7:33 ` [PATCH net 3/5] netfilter: nf_tables: unregister flowtable hooks on netns exit Pablo Neira Ayuso
2022-02-22 7:33 ` [PATCH net 4/5] netfilter: nft_limit: fix stateful object memory leak Pablo Neira Ayuso
2022-02-22 7:33 ` [PATCH net 5/5] netfilter: nf_tables: fix memory leak during stateful obj update Pablo Neira Ayuso
2022-02-22 17:14 ` [PATCH net 0/5,v2] Netfilter 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=20220222073312.308406-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).