netfilter: new hook nfnl subsystem
Subsystems (2)
Florian Westphal
maintainerv2 cover netfilter: new hook nfnl subsystem
v2: patch 2 needs to update nfnl_lockdep_names[] in nfnetlink.c.
First patch is a required dependency to allow to check when its safe to treat the 'priv' pointer as a nft base chain pointer.
Second patch adds a new nfnl subsystem to enable userspace to dump the active hooks to userspace.
Previous patches added this to nf_tables instead, but technically this isn't related to nf_tables.
Using a new nfnl subsys allows to extend this later, e.g. to send out notifications, e.g. when a new base hook is registered.
Florian Westphal (2):
netfilter: annotate nf_tables base hook ops
netfilter: add new hook nfnl subsystem
include/linux/netfilter.h | 8 +- include/uapi/linux/netfilter/nfnetlink.h | 3 +- include/uapi/linux/netfilter/nfnetlink_hook.h | 54 +++ net/netfilter/Kconfig | 9 + net/netfilter/Makefile | 1 + net/netfilter/nf_tables_api.c | 4 +- net/netfilter/nfnetlink.c | 1 + net/netfilter/nfnetlink_hook.c | 375 ++++++++++++++++++ 8 files changed, 452 insertions(+), 3 deletions(-) create mode 100644 include/uapi/linux/netfilter/nfnetlink_hook.h create mode 100644 net/netfilter/nfnetlink_hook.c
Signature · 1 line
2.26.3
Florian Westphal
maintainerPATCH v2 1/2 netfilter: annotate nf_tables base hook ops
This will allow a followup patch to treat the 'ops->priv' pointer as nft_chain argument without having to first walk the table/chains to check if there is a matching base chain pointer.
---
no changes.
include/linux/netfilter.h | 8 +++++++- net/netfilter/nf_tables_api.c | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-)
include/linux/netfilter.h +7 -1
@@ -77,12 +77,18 @@ struct nf_hook_state {typedef unsigned int nf_hookfn (void *priv,struct sk_buff *skb,const struct nf_hook_state *state); +enum nf_hook_ops_type { +NF_HOOK_OP_UNDEFINED , +NF_HOOK_OP_NF_TABLES , +}; +struct nf_hook_ops {/* User fills in from here down. */ nf_hookfn *hook;struct net_device *dev;void *priv; -u_int8_t pf; +u8 pf; +enum nf_hook_ops_type hook_ops_type:8 ;unsigned int hooknum;/* Hooks are ordered in ascending priority. */ int priority;
net/netfilter/nf_tables_api.c +3 -1
@@ -2172,8 +2172,10 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, }nft_trans_chain_policy (trans) =NFT_CHAIN_POLICY_UNSET ; -if (nft_is_base_chain (chain)) +if (nft_is_base_chain (chain)) { + basechain->ops.hook_ops_type =NF_HOOK_OP_NF_TABLES ;nft_trans_chain_policy (trans) = policy; + } err =nft_chain_add (table, chain);if (err <0 ) {
Signature · 1 line
2.26.3
Florian Westphal
maintainerPATCH v2 2/2 netfilter: add new hook nfnl subsystem
In reply to Florian WestphalThis nfnl subsystem allows to dump the list of all active netfiler hooks, e.g. defrag, conntrack, nf/ip/arp/ip6tables and so on.
This helps to see what kind of features are currently enabled in the network stack.
Sample output from nft tool using this infra:
$ nft list hook ip input
family ip hook input {
+0000000010 nft_do_chain_inet [nf_tables] # nft table firewalld INPUT
+0000000100 nf_nat_ipv4_local_in [nf_nat]
+2147483647 ipv4_confirm [nf_conntrack]
}---
v2: also update subsys name table in nfnetlink.c.
include/uapi/linux/netfilter/nfnetlink.h | 3 +- include/uapi/linux/netfilter/nfnetlink_hook.h | 54 +++ net/netfilter/Kconfig | 9 + net/netfilter/Makefile | 1 + net/netfilter/nfnetlink.c | 1 + net/netfilter/nfnetlink_hook.c | 375 ++++++++++++++++++ 6 files changed, 442 insertions(+), 1 deletion(-) create mode 100644 include/uapi/linux/netfilter/nfnetlink_hook.h create mode 100644 net/netfilter/nfnetlink_hook.c
include/uapi/linux/netfilter/nfnetlink.h +2 -1
@@ -60,7 +60,8 @@ struct nfgenmsg {#define NFNL_SUBSYS_CTHELPER 9#define NFNL_SUBSYS_NFTABLES 10#define NFNL_SUBSYS_NFT_COMPAT 11 -#define NFNL_SUBSYS_COUNT 12 +#define NFNL_SUBSYS_HOOK 12 +#define NFNL_SUBSYS_COUNT 13/* Reserved control nfnetlink messages */ #define NFNL_MSG_BATCH_BEGIN NLMSG_MIN_TYPE
include/uapi/linux/netfilter/nfnetlink_hook.h new file +54 -0
54 lines not on this page · raw message
net/netfilter/Kconfig +9 -0
@@ -19,6 +19,15 @@ config NETFILTER_FAMILY_BRIDGE config NETFILTER_FAMILY_ARP bool +config NETFILTER_NETLINK_HOOK + tristate "Netfilter base hook dump support" + depends on NETFILTER_ADVANCED + select NETFILTER_NETLINK + help + If this option is enabled, the kernel will include support + to list the base netfilter hooks via NFNETLINK. + This is helpful for debugging. + config NETFILTER_NETLINK_ACCT tristate "Netfilter NFACCT over NFNETLINK interface" depends on NETFILTER_ADVANCED
net/netfilter/Makefile +1 -0
@@ -22,6 +22,7 @@ obj-$(CONFIG_NETFILTER_NETLINK_ACCT) += nfnetlink_acct.o obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o obj-$(CONFIG_NETFILTER_NETLINK_LOG) += nfnetlink_log.o obj-$(CONFIG_NETFILTER_NETLINK_OSF) += nfnetlink_osf.o +obj-$(CONFIG_NETFILTER_NETLINK_HOOK) += nfnetlink_hook.o # connection tracking obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o
net/netfilter/nfnetlink.c +1 -0
@@ -68,6 +68,7 @@ static const char *const nfnl_lockdep_names[NFNL_SUBSYS_COUNT] = { [NFNL_SUBSYS_CTHELPER] = "nfnl_subsys_cthelper", [NFNL_SUBSYS_NFTABLES] = "nfnl_subsys_nftables", [NFNL_SUBSYS_NFT_COMPAT] = "nfnl_subsys_nftcompat", + [NFNL_SUBSYS_HOOK] = "nfnl_subsys_hook", };static const int nfnl_group2type[NFNLGRP_MAX +1 ] = {
net/netfilter/nfnetlink_hook.c new file +375 -0
375 lines not on this page · raw message
Signature · 1 line
2.26.3
Pablo Neira Ayuso
maintainerQuoted 5 lines · Florian Westphal
v2: patch 2 needs to update nfnl_lockdep_names[] in
nfnetlink.c.First patch is a required dependency to allow to check when its safe to treat the 'priv' pointer as a nft base chain pointer.
Quoted 8 lines
Second patch adds a new nfnl subsystem to enable userspace to dump the active hooks to userspace.
Previous patches added this to
nf_tablesinstead, but technically this isn't related tonf_tables.Using a new nfnl subsys allows to extend this later, e.g. to send out notifications, e.g. when a new base hook is registered.
Series applied, thanks.