netfilter: nf_tables: add hook transactions for device deletions
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH v4 1/1 netfilter: nf_tables: add hook transactions for device deletions
Restore the flag that indicates that the hook is going away, ie. NFT_HOOK_REMOVE, but add a new transaction object to track deletion of hooks without altering the basechain/flowtable hook_list during the preparation phase.
The existing approach that moves the hook from the basechain/flowtable hook_list to transaction hook_list breaks netlink dump path readers of this RCU-protected list.
It should be possible use an array for nft_trans_hook to store the deleted hooks to compact the representation but I am not expecting many hook object, specially now that wildcard support for devices is in place.
Note that the nft_trans_chain_hooks() list contains a list of struct nft_trans_hook objects for DELCHAIN and DELFLOWTABLE commands, while this list stores struct nft_hook objects for NEWCHAIN and NEWFLOWTABLE. Note that new commands can be updated to use nft_trans_hook for consistency.
This patch also adapts the event notification path to deal with the list of hook transactions.
--- include/net/netfilter/nf_tables.h | 13 ++ net/netfilter/nf_tables_api.c | 251 +++++++++++++++++++++++------- 2 files changed, 212 insertions(+), 52 deletions(-)
include/net/netfilter/nf_tables.h +13 -0
@@ -1216,12 +1216,15 @@ struct nft_stats {struct u64_stats_sync syncp; }; +#define NFT_HOOK_REMOVE (1 << 0) +struct nft_hook {struct list_head list;struct list_head ops_list;struct rcu_head rcu;char ifname[IFNAMSIZ ];u8 ifnamelen; +u8 flags; }; struct nf_hook_ops *nft_hook_find_ops(const struct nft_hook *hook,
@@ -1676,6 +1679,16 @@ struct nft_trans { u8 put_net:1; }; +/** +* struct nft_trans_hook - nf_tables hook update in transaction +* @list: used internally +* @hook: struct nft_hook with the device hook +*/ +struct nft_trans_hook { +struct list_head list; +struct nft_hook *hook; +}; +/** * struct nft_trans_binding - nf_tables object with binding support in transaction * @nft_trans: base structure, MUST be first member
net/netfilter/nf_tables_api.c +199 -52
489 lines not on this page · raw message
Signature · 1 line
2.47.3