From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 10/15] netfilter: x_tables: add module alias for icmp matches
Date: Mon, 14 May 2018 00:36:51 +0200 [thread overview]
Message-ID: <20180513223656.10077-11-pablo@netfilter.org> (raw)
In-Reply-To: <20180513223656.10077-1-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
The icmp matches are implemented in ip_tables and ip6_tables,
respectively, so for normal iptables they are always available:
those modules are loaded once iptables calls getsockopt() to fetch
available module revisions.
In iptables-over-nftables case probing occurs via nfnetlink, so
these modules might not be loaded. Add aliases so modprobe can load
these when icmp/icmp6 is requested.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/ipv4/netfilter/ip_tables.c | 1 +
net/ipv6/netfilter/ip6_tables.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 44b308d93ec2..e85f35b89c49 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -34,6 +34,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
MODULE_DESCRIPTION("IPv4 packet filter");
+MODULE_ALIAS("ipt_icmp");
void *ipt_alloc_initial_table(const struct xt_table *info)
{
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 65c9e1a58305..97f79dc943d7 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -38,6 +38,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
MODULE_DESCRIPTION("IPv6 packet filter");
+MODULE_ALIAS("ip6t_icmp6");
void *ip6t_alloc_initial_table(const struct xt_table *info)
{
--
2.11.0
next prev parent reply other threads:[~2018-05-13 22:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-13 22:36 [PATCH 00/15] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 01/15] netfilter: Fix handling simultaneous open in TCP conntrack Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 02/15] netfilter: x_tables: check name length in find_match/target, too Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 03/15] netfilter: nf_tables: skip synchronize_rcu if transaction log is empty Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 04/15] netfilter: bridge: stp fix reference to uninitialized data Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 05/15] netfilter: nf_tables: nft_compat: fix refcount leak on xt module Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 06/15] ipvs: fix refcount usage for conns in ops mode Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 07/15] ipvs: fix stats update from local clients Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 08/15] netfilter: core: add missing __rcu annotation Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 09/15] netfilter: prefer nla_strlcpy for dealing with NLA_STRING attributes Pablo Neira Ayuso
2018-05-13 22:36 ` Pablo Neira Ayuso [this message]
2018-05-13 22:36 ` [PATCH 11/15] netfilter: nf_tables: don't assume chain stats are set when jumplabel is set Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 12/15] netfilter: nft_compat: prepare for indirect info storage Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 13/15] netfilter: nft_compat: fix handling of large matchinfo size Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 14/15] netfilter: nf_tables: bogus EBUSY in chain deletions Pablo Neira Ayuso
2018-05-13 22:36 ` [PATCH 15/15] netfilter: nf_tables: fix memory leak on error exit return Pablo Neira Ayuso
2018-05-14 1:05 ` [PATCH 00/15] Netfilter/IPVS fixes for net David Miller
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=20180513223656.10077-11-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--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).