iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nf_log_bridge: merge with nf_log_syslog

Browse Source 
Provide bridge log support from nf_log_syslog.

After the merge there is no need to load the "real packet loggers",
all of them now reside in the same module.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2021-03-25 18:25:09 +01:00 committed by Pablo Neira Ayuso
parent 1510618e45
commit 77ccee96a6
6 changed files with 22 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/netfilter/nf_log.h
View File

@ -68,7 +68,6 @@ void nf_log_unbind_pf(struct net *net, u_int8_t pf);
int nf_logger_find_get(int pf, enum nf_log_type type); int nf_logger_find_get(int pf, enum nf_log_type type);
void nf_logger_put(int pf, enum nf_log_type type); void nf_logger_put(int pf, enum nf_log_type type);
void nf_logger_request_module(int pf, enum nf_log_type type);
#define MODULE_ALIAS_NF_LOGGER(family, type) \ #define MODULE_ALIAS_NF_LOGGER(family, type) \
MODULE_ALIAS("nf-logger-" __stringify(family) "-" __stringify(type)) MODULE_ALIAS("nf-logger-" __stringify(family) "-" __stringify(type))

4
net/bridge/netfilter/Kconfig
View File

@ -23,10 +23,6 @@ config NFT_BRIDGE_REJECT
help help
Add support to reject packets. Add support to reject packets.
config NF_LOG_BRIDGE
tristate "Bridge packet logging"
select NF_LOG_COMMON
endif # NF_TABLES_BRIDGE endif # NF_TABLES_BRIDGE
config NF_CONNTRACK_BRIDGE config NF_CONNTRACK_BRIDGE

3
net/bridge/netfilter/Makefile
View File

@ -9,9 +9,6 @@ obj-$(CONFIG_NFT_BRIDGE_REJECT) += nft_reject_bridge.o
# connection tracking # connection tracking
obj-$(CONFIG_NF_CONNTRACK_BRIDGE) += nf_conntrack_bridge.o obj-$(CONFIG_NF_CONNTRACK_BRIDGE) += nf_conntrack_bridge.o
# packet logging
obj-$(CONFIG_NF_LOG_BRIDGE) += nf_log_bridge.o
obj-$(CONFIG_BRIDGE_NF_EBTABLES) += ebtables.o obj-$(CONFIG_BRIDGE_NF_EBTABLES) += ebtables.o
# tables # tables

79
net/bridge/netfilter/nf_log_bridge.c
View File

@ -1,79 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* (C) 2014 by Pablo Neira Ayuso <pablo@netfilter.org>
*/
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/skbuff.h>
#include <linux/if_bridge.h>
#include <linux/ip.h>
#include <net/route.h>
#include <linux/netfilter.h>
#include <net/netfilter/nf_log.h>
static void nf_log_bridge_packet(struct net *net, u_int8_t pf,
unsigned int hooknum,
const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
const struct nf_loginfo *loginfo,
const char *prefix)
{
nf_log_l2packet(net, pf, eth_hdr(skb)->h_proto, hooknum, skb,
in, out, loginfo, prefix);
}
static struct nf_logger nf_bridge_logger __read_mostly = {
.name = "nf_log_bridge",
.type = NF_LOG_TYPE_LOG,
.logfn = nf_log_bridge_packet,
.me = THIS_MODULE,
};
static int __net_init nf_log_bridge_net_init(struct net *net)
{
return nf_log_set(net, NFPROTO_BRIDGE, &nf_bridge_logger);
}
static void __net_exit nf_log_bridge_net_exit(struct net *net)
{
nf_log_unset(net, &nf_bridge_logger);
}
static struct pernet_operations nf_log_bridge_net_ops = {
.init = nf_log_bridge_net_init,
.exit = nf_log_bridge_net_exit,
};
static int __init nf_log_bridge_init(void)
{
int ret;
/* Request to load the real packet loggers. */
nf_logger_request_module(NFPROTO_IPV4, NF_LOG_TYPE_LOG);
nf_logger_request_module(NFPROTO_IPV6, NF_LOG_TYPE_LOG);
nf_logger_request_module(NFPROTO_ARP, NF_LOG_TYPE_LOG);
ret = register_pernet_subsys(&nf_log_bridge_net_ops);
if (ret < 0)
return ret;
nf_log_register(NFPROTO_BRIDGE, &nf_bridge_logger);
return 0;
}
static void __exit nf_log_bridge_exit(void)
{
unregister_pernet_subsys(&nf_log_bridge_net_ops);
nf_log_unregister(&nf_bridge_logger);
}
module_init(nf_log_bridge_init);
module_exit(nf_log_bridge_exit);
MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
MODULE_DESCRIPTION("Netfilter bridge packet logging");
MODULE_LICENSE("GPL");
MODULE_ALIAS_NF_LOGGER(AF_BRIDGE, 0);

7
net/netfilter/nf_log.c
View File

@ -151,13 +151,6 @@ void nf_log_unbind_pf(struct net *net, u_int8_t pf)
} }
EXPORT_SYMBOL(nf_log_unbind_pf); EXPORT_SYMBOL(nf_log_unbind_pf);
void nf_logger_request_module(int pf, enum nf_log_type type)
{
if (loggers[pf][type] == NULL)
request_module("nf-logger-%u-%u", pf, type);
}
EXPORT_SYMBOL_GPL(nf_logger_request_module);
int nf_logger_find_get(int pf, enum nf_log_type type) int nf_logger_find_get(int pf, enum nf_log_type type)
{ {
struct nf_logger *logger; struct nf_logger *logger;

22
net/netfilter/nf_log_syslog.c
View File

@ -787,6 +787,13 @@ static struct nf_logger nf_netdev_logger __read_mostly = {
.me = THIS_MODULE, .me = THIS_MODULE,
}; };
static struct nf_logger nf_bridge_logger __read_mostly = {
.name = "nf_log_bridge",
.type = NF_LOG_TYPE_LOG,
.logfn = nf_log_netdev_packet,
.me = THIS_MODULE,
};
static int __net_init nf_log_syslog_net_init(struct net *net) static int __net_init nf_log_syslog_net_init(struct net *net)
{ {
int ret = nf_log_set(net, NFPROTO_IPV4, &nf_ip_logger); int ret = nf_log_set(net, NFPROTO_IPV4, &nf_ip_logger);
@ -805,7 +812,13 @@ static int __net_init nf_log_syslog_net_init(struct net *net)
ret = nf_log_set(net, NFPROTO_NETDEV, &nf_netdev_logger); ret = nf_log_set(net, NFPROTO_NETDEV, &nf_netdev_logger);
if (ret) if (ret)
goto err3; goto err3;
ret = nf_log_set(net, NFPROTO_BRIDGE, &nf_bridge_logger);
if (ret)
goto err4;
return 0; return 0;
err4:
nf_log_unset(net, &nf_netdev_logger);
err3: err3:
nf_log_unset(net, &nf_ip6_logger); nf_log_unset(net, &nf_ip6_logger);
err2: err2:
@ -852,7 +865,13 @@ static int __init nf_log_syslog_init(void)
if (ret < 0) if (ret < 0)
goto err4; goto err4;
ret = nf_log_register(NFPROTO_BRIDGE, &nf_bridge_logger);
if (ret < 0)
goto err5;
return 0; return 0;
err5:
nf_log_unregister(&nf_netdev_logger);
err4: err4:
nf_log_unregister(&nf_ip6_logger); nf_log_unregister(&nf_ip6_logger);
err3: err3:
@ -872,6 +891,7 @@ static void __exit nf_log_syslog_exit(void)
nf_log_unregister(&nf_arp_logger); nf_log_unregister(&nf_arp_logger);
nf_log_unregister(&nf_ip6_logger); nf_log_unregister(&nf_ip6_logger);
nf_log_unregister(&nf_netdev_logger); nf_log_unregister(&nf_netdev_logger);
nf_log_unregister(&nf_bridge_logger);
} }
module_init(nf_log_syslog_init); module_init(nf_log_syslog_init);
@ -881,9 +901,11 @@ MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
MODULE_DESCRIPTION("Netfilter syslog packet logging"); MODULE_DESCRIPTION("Netfilter syslog packet logging");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("nf_log_arp"); MODULE_ALIAS("nf_log_arp");
MODULE_ALIAS("nf_log_bridge");
MODULE_ALIAS("nf_log_ipv4"); MODULE_ALIAS("nf_log_ipv4");
MODULE_ALIAS("nf_log_ipv6"); MODULE_ALIAS("nf_log_ipv6");
MODULE_ALIAS("nf_log_netdev"); MODULE_ALIAS("nf_log_netdev");
MODULE_ALIAS_NF_LOGGER(AF_BRIDGE, 0);
MODULE_ALIAS_NF_LOGGER(AF_INET, 0); MODULE_ALIAS_NF_LOGGER(AF_INET, 0);
MODULE_ALIAS_NF_LOGGER(3, 0); MODULE_ALIAS_NF_LOGGER(3, 0);
MODULE_ALIAS_NF_LOGGER(5, 0); /* NFPROTO_NETDEV */ MODULE_ALIAS_NF_LOGGER(5, 0); /* NFPROTO_NETDEV */