stable fixes for 5.10
Subsystems (2)
Pablo Neira Ayuso
maintainerv2 cover stable fixes for 5.10
Hi Greg, Sasha,
[ This is v2 appends patch #11 f838e0906dd3 as Florian suggested. ]
The following list shows the backported patches, I am using original commit IDs for reference:
1) 0854db2aaef3 ("netfilter: nf_tables: use net_generic infra for transaction data")
2) 81ea01066741 ("netfilter: nf_tables: add rescheduling points during loop detection walks")
3) 1240eb93f061 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE")
4) 4bedf9eee016 ("netfilter: nf_tables: fix chain binding transaction logic")
5) 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain")
6) 938154b93be8 ("netfilter: nf_tables: reject unbound anonymous set before commit phase")
7) 62e1e94b246e ("netfilter: nf_tables: reject unbound chain set before commit phase")
8) f8bb7889af58 ("netfilter: nftables: rename set element data activation/deactivation functions")
9) 628bd3e49cba ("netfilter: nf_tables: drop map element references from preparation phase")
10) 3e70489721b6 ("netfilter: nf_tables: unbind non-anonymous set if rule construction fails")
11) f838e0906dd3 ("netfilter: nf_tables: fix scheduling-while-atomic splat")
Note:
- Patch #1 is a backported dependency patch required by these fixes.
- Patch #2 needs a follow up fix coming in this series as patch #11.
Please, apply,
Thanks.
Florian Westphal (3):
netfilter: nf_tables: use net_generic infra for transaction data
netfilter: nf_tables: add rescheduling points during loop detection walks
netfilter: nf_tables: fix scheduling-while-atomic splat
Pablo Neira Ayuso (8):
netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
netfilter: nf_tables: fix chain binding transaction logic
netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
netfilter: nf_tables: reject unbound anonymous set before commit phase
netfilter: nf_tables: reject unbound chain set before commit phase
netfilter: nftables: rename set element data activation/deactivation functions
netfilter: nf_tables: drop map element references from preparation phase
netfilter: nf_tables: unbind non-anonymous set if rule construction fails
include/net/netfilter/nf_tables.h | 41 +- include/net/netns/nftables.h | 7 - net/netfilter/nf_tables_api.c | 692 +++++++++++++++++++++--------- net/netfilter/nf_tables_offload.c | 30 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_dynset.c | 6 +- net/netfilter/nft_immediate.c | 90 +++- net/netfilter/nft_set_bitmap.c | 5 +- net/netfilter/nft_set_hash.c | 23 +- net/netfilter/nft_set_pipapo.c | 14 +- net/netfilter/nft_set_rbtree.c | 5 +- 11 files changed, 678 insertions(+), 246 deletions(-)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 1/11 netfilter: nf_tables: use net_generic infra for transaction data
From: Florian Westphal <[email protected]>
[ 0854db2aaef3fcdd3498a9d299c60adea2aa3dc6 ]
This moves all nf_tables pernet data from struct net to a net_generic extension, with the exception of the gencursor.
The latter is used in the data path and also outside of the nf_tables core. All others are only used from the configuration plane.
--- include/net/netfilter/nf_tables.h | 10 + include/net/netns/nftables.h | 7 - net/netfilter/nf_tables_api.c | 382 ++++++++++++++++++------------ net/netfilter/nf_tables_offload.c | 30 ++- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_dynset.c | 6 +- 6 files changed, 279 insertions(+), 167 deletions(-)
include/net/netfilter/nf_tables.h +10 -0
@@ -1535,4 +1535,14 @@ void nf_tables_trans_destroy_flush_work(void);int nf_msecs_to_jiffies64 (const struct nlattr *nla,u64 *result);__be64 nf_jiffies64_to_msecs (u64 input); +struct nftables_pernet { +struct list_head tables; +struct list_head commit_list; +struct list_head module_list; +struct list_head notify_list; +struct mutex commit_mutex; +unsigned int base_seq; +u8 validate_state; +}; +#endif /* _NET_NF_TABLES_H */
include/net/netns/nftables.h +0 -7
@@ -5,14 +5,7 @@#include <linux/list.h> struct netns_nftables { -struct list_head tables; -struct list_head commit_list; -struct list_head module_list; -struct list_head notify_list; -struct mutex commit_mutex; -unsigned int base_seq;u8 gencursor; -u8 validate_state; };#endif
net/netfilter/nf_tables_api.c +237 -145
1,098 lines not on this page · raw message
net/netfilter/nf_tables_offload.c +19 -11
@@ -7,6 +7,8 @@#include <net/netfilter/nf_tables_offload.h> #include <net/pkt_cls.h> +extern unsigned int nf_tables_net_id; +static struct nft_flow_rule *nft_flow_rule_alloc (int num_actions) {struct nft_flow_rule *flow;
@@ -371,16 +373,18 @@ static void nft_indr_block_cleanup(struct flow_block_cb *block_cb)struct nft_base_chain *basechain = block_cb->indr.data;struct net_device *dev = block_cb->indr.dev;struct netlink_ext_ack extack = {}; +struct nftables_pernet *nft_net;struct net *net =dev_net (dev);struct flow_block_offload bo;nft_flow_block_offload_init (&bo,dev_net (dev),FLOW_BLOCK_UNBIND , basechain, &extack); -mutex_lock (&net->nft.commit_mutex); + nft_net =net_generic (net, nf_tables_net_id); +mutex_lock (&nft_net->commit_mutex);list_del (&block_cb->driver_list);list_move (&block_cb->list, &bo.cb_list);nft_flow_offload_unbind (&bo, basechain); -mutex_unlock (&net->nft.commit_mutex); +mutex_unlock (&nft_net->commit_mutex); } static int nft_indr_block_offload_cmd(struct nft_base_chain *basechain,
@@ -476,9 +480,10 @@ static int nft_flow_offload_chain(struct nft_chain *chain, u8 *ppolicy,static void nft_flow_rule_offload_abort (struct net *net,struct nft_trans *trans) { +struct nftables_pernet *nft_net =net_generic (net, nf_tables_net_id);int err =0 ; -list_for_each_entry_continue_reverse (trans, &net->nft.commit_list, list) { +list_for_each_entry_continue_reverse (trans, &nft_net->commit_list, list) {if (trans->ctx.family !=NFPROTO_NETDEV )continue ;
@@ -524,11 +529,12 @@ static void nft_flow_rule_offload_abort(struct net *net,int nft_flow_rule_offload_commit (struct net *net) { +struct nftables_pernet *nft_net =net_generic (net, nf_tables_net_id);struct nft_trans *trans;int err =0 ;u8 policy; -list_for_each_entry (trans, &net->nft.commit_list, list) { +list_for_each_entry (trans, &nft_net->commit_list, list) {if (trans->ctx.family !=NFPROTO_NETDEV )continue ;
@@ -580,7 +586,7 @@ int nft_flow_rule_offload_commit(struct net *net) } } -list_for_each_entry (trans, &net->nft.commit_list, list) { +list_for_each_entry (trans, &nft_net->commit_list, list) {if (trans->ctx.family !=NFPROTO_NETDEV )continue ;
@@ -600,15 +606,15 @@ int nft_flow_rule_offload_commit(struct net *net)return err; } -static struct nft_chain *__nft_offload_get_chain (struct net_device *dev) +static struct nft_chain *__nft_offload_get_chain (const struct nftables_pernet *nft_net, +struct net_device *dev) {struct nft_base_chain *basechain; -struct net *net =dev_net (dev);struct nft_hook *hook, *found;const struct nft_table *table;struct nft_chain *chain; -list_for_each_entry (table, &net->nft.tables, list) { +list_for_each_entry (table, &nft_net->tables, list) {if (table->family !=NFPROTO_NETDEV )continue ;
@@ -640,19 +646,21 @@ static int nft_offload_netdev_event(struct notifier_block *this, unsigned long event, void *ptr) { struct net_device *dev = netdev_notifier_info_to_dev(ptr); +struct nftables_pernet *nft_net;struct net *net =dev_net (dev);struct nft_chain *chain;if (event !=NETDEV_UNREGISTER )return NOTIFY_DONE ; -mutex_lock (&net->nft.commit_mutex); - chain =__nft_offload_get_chain (dev); + nft_net =net_generic (net, nf_tables_net_id); +mutex_lock (&nft_net->commit_mutex); + chain =__nft_offload_get_chain (nft_net, dev);if (chain)nft_flow_block_chain (nft_base_chain (chain), dev,FLOW_BLOCK_UNBIND ); -mutex_unlock (&net->nft.commit_mutex); +mutex_unlock (&nft_net->commit_mutex);return NOTIFY_DONE ; }
net/netfilter/nft_chain_filter.c +8 -3
@@ -2,6 +2,7 @@#include <linux/kernel.h> #include <linux/netdevice.h> #include <net/net_namespace.h> +#include <net/netns/generic.h> #include <net/netfilter/nf_tables.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv6.h>
@@ -10,6 +11,8 @@#include <net/netfilter/nf_tables_ipv4.h> #include <net/netfilter/nf_tables_ipv6.h> +extern unsigned int nf_tables_net_id; +#ifdef CONFIG_NF_TABLES_IPV4 static unsigned int nft_do_chain_ipv4(void *priv, struct sk_buff *skb,
@@ -355,6 +358,7 @@ static int nf_tables_netdev_event(struct notifier_block *this, unsigned long event, void *ptr) { struct net_device *dev = netdev_notifier_info_to_dev(ptr); +struct nftables_pernet *nft_net;struct nft_table *table;struct nft_chain *chain, *nr; struct nft_ctx ctx = {
@@ -365,8 +369,9 @@ static int nf_tables_netdev_event(struct notifier_block *this, event != NETDEV_CHANGENAME)return NOTIFY_DONE ; -mutex_lock (&ctx.net->nft.commit_mutex); -list_for_each_entry (table, &ctx.net->nft.tables, list) { + nft_net =net_generic (ctx.net, nf_tables_net_id); +mutex_lock (&nft_net->commit_mutex); +list_for_each_entry (table, &nft_net->tables, list) {if (table->family !=NFPROTO_NETDEV )continue ;
@@ -380,7 +385,7 @@ static int nf_tables_netdev_event(struct notifier_block *this,nft_netdev_event (event, dev, &ctx); } } -mutex_unlock (&ctx.net->nft.commit_mutex); +mutex_unlock (&nft_net->commit_mutex);return NOTIFY_DONE ; }
net/netfilter/nft_dynset.c +5 -1
@@ -11,6 +11,9 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> +#include <net/netns/generic.h> + +extern unsigned int nf_tables_net_id;struct nft_dynset {struct nft_set *set;
@@ -106,13 +109,14 @@ static int nft_dynset_init(const struct nft_ctx *ctx,const struct nft_expr *expr, const struct nlattr * const tb[]) { + struct nftables_pernet *nft_net = net_generic(ctx->net, nf_tables_net_id);struct nft_dynset *priv =nft_expr_priv (expr);u8 genmask =nft_genmask_next (ctx->net);struct nft_set *set;u64 timeout;int err; -lockdep_assert_held (&ctx->net->nft.commit_mutex); +lockdep_assert_held (&nft_net->commit_mutex); if (tb[NFTA_DYNSET_SET_NAME] == NULL || tb[NFTA_DYNSET_OP] == NULL ||
Signature · 1 line
2.30.2
Re: [PATCH -stable,5.10,v2 01/11] netfilter: nf_tables: use net_generic infra for transaction data
Hi,
Quoted 3 lines · Pablo Neira Ayuso
From: Florian Westphal <[email protected]>
[
0854db2aaef3fcdd3498a9d299c60adea2aa3dc6]
For all patches in this series, that should be either
[ Upstream commit 0854db2aaef3fcdd3498a9d299c60adea2aa3dc6 ]
or
commit 0854db2aaef3fcdd3498a9d299c60adea2aa3dc6 upstream.
to keep current used formats?
Regards,
Salvatore
Pablo Neira Ayuso
maintainerRe: [PATCH -stable,5.10,v2 01/11] netfilter: nf_tables: use net_generic infra for transaction data
Quoted 7 lines · Salvatore Bonaccorso
Hi,
Quoted 3 lines · Pablo Neira Ayuso
From: Florian Westphal <[email protected]>
[
0854db2aaef3fcdd3498a9d299c60adea2aa3dc6]
Quoted 7 lines
For all patches in this series, that should be either
[ Upstream commit
0854db2aaef3fcdd3498a9d299c60adea2aa3dc6]or
commit
0854db2aaef3fcdd3498a9d299c60adea2aa3dc6upstream.
I will fix this and submit a v3.
Thanks
Pablo Neira Ayuso
maintainerPATCH v2 2/11 netfilter: nf_tables: add rescheduling points during loop detection walks
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
[ 81ea010667417ef3f218dfd99b69769fe66c2b67 ]
Add explicit rescheduling points during ruleset walk.
Switching to a faster algorithm is possible but this is a much smaller change, suitable for nf tree.
--- net/netfilter/nf_tables_api.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/nf_tables_api.c +6 -0
@@ -3164,6 +3164,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain)if (err <0 )return err; } + +cond_resched (); }return 0 ;
@@ -8506,9 +8508,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,break ; } } + +cond_resched (); }list_for_each_entry (set, &ctx->table->sets, list) { +cond_resched (); +if (!nft_is_active_next (ctx->net, set))continue ; if (!(set->flags & NFT_SET_MAP) ||
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 3/11 netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
In reply to Pablo Neira Ayuso[ 1240eb93f0616b21c675416516ff3d74798fdc97 ]
In case of error when adding a new rule that refers to an anonymous set, deactivate expressions via NFT_TRANS_PREPARE state, not NFT_TRANS_RELEASE. Thus, the lookup expression marks anonymous sets as inactive in the next generation to ensure it is not reachable in this transaction anymore and decrement the set refcount as introduced by c1592a89942e ("netfilter:nf_tables: deactivate anonymous set from preparation phase"). The abort step takes care of undoing the anonymous set.
This is also consistent with rule deletion, where NFT_TRANS_PREPARE is used. Note that this error path is exercised in the preparation step of the commit protocol. This patch replaces nf_tables_rule_release() by the deactivate and destroy calls, this time with NFT_TRANS_PREPARE.
Due to this incorrect error handling, it is possible to access a dangling pointer to the anonymous set that remains in the transaction list.
[1009.379054] BUG: KASAN: use-after-free in nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379106] Read of size 8 at addr ffff88816c4c8020 by task nft-rule-add/137110 [1009.379116] CPU: 7 PID: 137110 Comm: nft-rule-add Not tainted 6.4.0-rc4+ #256 [1009.379128] Call Trace: [1009.379132] <TASK> [1009.379135] dump_stack_lvl+0x33/0x50 [1009.379146] ? nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379191] print_address_description.constprop.0+0x27/0x300 [1009.379201] kasan_report+0x107/0x120 [1009.379210] ? nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379255] nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379302] nft_lookup_init+0xa5/0x270 [nf_tables] [1009.379350] nf_tables_newrule+0x698/0xe50 [nf_tables] [1009.379397] ? nf_tables_rule_release+0xe0/0xe0 [nf_tables] [1009.379441] ? kasan_unpoison+0x23/0x50 [1009.379450] nfnetlink_rcv_batch+0x97c/0xd90 [nfnetlink] [1009.379470] ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink] [1009.379485] ? __alloc_skb+0xb8/0x1e0 [1009.379493] ? __alloc_skb+0xb8/0x1e0 [1009.379502] ? entry_SYSCALL_64_after_hwframe+0x46/0xb0 [1009.379509] ? unwind_get_return_address+0x2a/0x40 [1009.379517] ? write_profile+0xc0/0xc0 [1009.379524] ? avc_lookup+0x8f/0xc0 [1009.379532] ? __rcu_read_unlock+0x43/0x60
--- net/netfilter/nf_tables_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +2 -1
@@ -3409,7 +3409,8 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,return 0 ; err2: -nf_tables_rule_release (&ctx, rule); +nft_rule_expr_deactivate (&ctx, rule,NFT_TRANS_PREPARE ); +nf_tables_rule_destroy (&ctx, rule); err1:for (i =0 ; i < n; i++) {if (info[i].ops) {
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 4/11 netfilter: nf_tables: fix chain binding transaction logic
In reply to Pablo Neira Ayuso[ 4bedf9eee016286c835e3d8fa981ddece5338795]
Add bound flag to rule and chain transactions as in 6a0a8d10a366 ("netfilter: nf_tables: use-after-free in failing rule with bound set") to skip them in case that the chain is already bound from the abort path.
This patch fixes an imbalance in the chain use refcnt that triggers a WARN_ON on the table and chain destroy path.
This patch also disallows nested chain bindings, which is not supported from userspace.
The logic to deal with chain binding in nft_data_hold() and nft_data_release() is not correct. The NFT_TRANS_PREPARE state needs a special handling in case a chain is bound but next expressions in the same rule fail to initialize as described by 1240eb93f061 ("netfilter:nf_tables: incorrect error path handling with NFT_MSG_NEWRULE").
The chain is left bound if rule construction fails, so the objects stored in this chain (and the chain itself) are released by the transaction records from the abort path, follow up patch ("netfilter:nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain") completes this error handling.
When deleting an existing rule, chain bound flag is set off so the rule expression .destroy path releases the objects.
--- include/net/netfilter/nf_tables.h | 21 +++++++- net/netfilter/nf_tables_api.c | 86 +++++++++++++++++++----------- net/netfilter/nft_immediate.c | 87 +++++++++++++++++++++++++++---- 3 files changed, 153 insertions(+), 41 deletions(-)
include/net/netfilter/nf_tables.h +20 -1
@@ -907,7 +907,10 @@ static inline struct nft_userdata *nft_userdata(const struct nft_rule *rule)return (void *)&rule->data[rule->dlen]; } -void nf_tables_rule_release (const struct nft_ctx *ctx,struct nft_rule *rule); +void nft_rule_expr_activate (const struct nft_ctx *ctx,struct nft_rule *rule); +void nft_rule_expr_deactivate (const struct nft_ctx *ctx,struct nft_rule *rule, +enum nft_trans_phase phase); +void nf_tables_rule_destroy (const struct nft_ctx *ctx,struct nft_rule *rule); static inline void nft_set_elem_update_expr(const struct nft_set_ext *ext, struct nft_regs *regs,
@@ -966,6 +969,7 @@ struct nft_chain { };int nft_chain_validate (const struct nft_ctx *ctx,const struct nft_chain *chain); +int nf_tables_bind_chain (const struct nft_ctx *ctx,struct nft_chain *chain);enum nft_chain_types {NFT_CHAIN_T_DEFAULT =0 ,
@@ -1002,11 +1006,17 @@ int nft_chain_validate_dependency(const struct nft_chain *chain,int nft_chain_validate_hooks (const struct nft_chain *chain,unsigned int hook_flags); +static inline bool nft_chain_binding (const struct nft_chain *chain) +{ +return chain->flags &NFT_CHAIN_BINDING ; +} +static inline bool nft_chain_is_bound (struct nft_chain *chain) {return (chain->flags &NFT_CHAIN_BINDING ) && chain->bound; } +int nft_chain_add (struct nft_table *table,struct nft_chain *chain);void nft_chain_del (struct nft_chain *chain);void nf_tables_chain_destroy (struct nft_ctx *ctx);
@@ -1431,6 +1441,7 @@ struct nft_trans_rule {struct nft_rule *rule;struct nft_flow_rule *flow;u32 rule_id; +bool bound; };#define nft_trans_rule (trans) \
@@ -1439,6 +1450,8 @@ struct nft_trans_rule { (((struct nft_trans_rule *)trans->data)->flow)#define nft_trans_rule_id (trans) \ (((struct nft_trans_rule *)trans->data)->rule_id) +#define nft_trans_rule_bound (trans) \ + (((struct nft_trans_rule *)trans->data)->bound)struct nft_trans_set {struct nft_set *set;
@@ -1454,13 +1467,17 @@ struct nft_trans_set { (((struct nft_trans_set *)trans->data)->bound)struct nft_trans_chain { +struct nft_chain *chain;bool update;char *name;struct nft_stats __percpu *stats;u8 policy; +bool bound;u32 chain_id; }; +#define nft_trans_chain (trans) \ + (((struct nft_trans_chain *)trans->data)->chain)#define nft_trans_chain_update (trans) \ (((struct nft_trans_chain *)trans->data)->update)#define nft_trans_chain_name (trans) \
@@ -1469,6 +1486,8 @@ struct nft_trans_chain { (((struct nft_trans_chain *)trans->data)->stats)#define nft_trans_chain_policy (trans) \ (((struct nft_trans_chain *)trans->data)->policy) +#define nft_trans_chain_bound (trans) \ + (((struct nft_trans_chain *)trans->data)->bound)#define nft_trans_chain_id (trans) \ (((struct nft_trans_chain *)trans->data)->chain_id)
net/netfilter/nf_tables_api.c +55 -31
165 lines not on this page · raw message
net/netfilter/nft_immediate.c +78 -9
116 lines not on this page · raw message
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 5/11 netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
In reply to Pablo Neira Ayuso[ 26b5a5712eb85e253724e56a54c17f8519bd8e4e ]
Add a new state to deal with rule expressions deactivation from the newrule error path, otherwise the anonymous set remains in the list in inactive state for the next generation. Mark the set/chain transaction as unbound so the abort path releases this object, set it as inactive in the next generation so it is not reachable anymore from this transaction and reference counter is dropped.
--- include/net/netfilter/nf_tables.h | 2 ++ net/netfilter/nf_tables_api.c | 45 ++++++++++++++++++++++++++----- net/netfilter/nft_immediate.c | 3 +++ 3 files changed, 43 insertions(+), 7 deletions(-)
include/net/netfilter/nf_tables.h +2 -0
@@ -777,6 +777,7 @@ struct nft_expr_type {enum nft_trans_phase {NFT_TRANS_PREPARE , +NFT_TRANS_PREPARE_ERROR ,NFT_TRANS_ABORT ,NFT_TRANS_COMMIT ,NFT_TRANS_RELEASE
@@ -970,6 +971,7 @@ struct nft_chain {int nft_chain_validate (const struct nft_ctx *ctx,const struct nft_chain *chain);int nf_tables_bind_chain (const struct nft_ctx *ctx,struct nft_chain *chain); +void nf_tables_unbind_chain (const struct nft_ctx *ctx,struct nft_chain *chain);enum nft_chain_types {NFT_CHAIN_T_DEFAULT =0 ,
net/netfilter/nf_tables_api.c +38 -7
103 lines not on this page · raw message
net/netfilter/nft_immediate.c +3 -0
@@ -150,6 +150,9 @@ static void nft_immediate_deactivate(const struct nft_ctx *ctx,nft_rule_expr_deactivate (&chain_ctx, rule, phase);switch (phase) { +case NFT_TRANS_PREPARE_ERROR : +nf_tables_unbind_chain (ctx, chain); + fallthrough;case NFT_TRANS_PREPARE :nft_deactivate_next (ctx->net, chain);break ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 6/11 netfilter: nf_tables: reject unbound anonymous set before commit phase
In reply to Pablo Neira Ayuso[ 938154b93be8cd611ddfd7bafc1849f3c4355201 ]
Add a new list to track set transaction and to check for unbound anonymous sets before entering the commit phase.
Bail out at the end of the transaction handling if an anonymous set remains unbound.
--- include/net/netfilter/nf_tables.h | 3 +++ net/netfilter/nf_tables_api.c | 34 ++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-)
include/net/netfilter/nf_tables.h +3 -0
@@ -1426,6 +1426,7 @@ static inline void nft_set_elem_clear_busy(struct nft_set_ext *ext)* struct nft_trans - nf_tables object update in transaction * * @list: used internally +* @binding_list: list of objects with possible bindings * @msg_type: message type * @put_net: ctx->net needs to be put * @ctx: transaction context
@@ -1433,6 +1434,7 @@ static inline void nft_set_elem_clear_busy(struct nft_set_ext *ext)*/ struct nft_trans {struct list_head list; +struct list_head binding_list;int msg_type;bool put_net;struct nft_ctx ctx;
@@ -1559,6 +1561,7 @@ __be64 nf_jiffies64_to_msecs(u64 input);struct nftables_pernet {struct list_head tables;struct list_head commit_list; +struct list_head binding_list;struct list_head module_list;struct list_head notify_list;struct mutex commit_mutex;
net/netfilter/nf_tables_api.c +31 -3
@@ -155,6 +155,7 @@ static struct nft_trans *nft_trans_alloc_gfp(const struct nft_ctx *ctx,return NULL ;INIT_LIST_HEAD (&trans->list); +INIT_LIST_HEAD (&trans->binding_list); trans->msg_type = msg_type; trans->ctx = *ctx;
@@ -167,9 +168,15 @@ static struct nft_trans *nft_trans_alloc(const struct nft_ctx *ctx,return nft_trans_alloc_gfp (ctx, msg_type, size,GFP_KERNEL ); } -static void nft_trans_destroy (struct nft_trans *trans) +static void nft_trans_list_del (struct nft_trans *trans) {list_del (&trans->list); +list_del (&trans->binding_list); +} + +static void nft_trans_destroy (struct nft_trans *trans) +{ +nft_trans_list_del (trans);kfree (trans); }
@@ -347,6 +354,14 @@ static void nft_trans_commit_list_add_tail(struct net *net, struct nft_trans *trstruct nftables_pernet *nft_net; nft_net =net_generic (net, nf_tables_net_id); + +switch (trans->msg_type) { +case NFT_MSG_NEWSET : +if (nft_set_is_anonymous (nft_trans_set (trans))) +list_add_tail (&trans->binding_list, &nft_net->binding_list); +break ; + } +list_add_tail (&trans->list, &nft_net->commit_list); }
@@ -7717,7 +7732,7 @@ static void nf_tables_trans_destroy_work(struct work_struct *w)synchronize_rcu ();list_for_each_entry_safe (trans, next, &head, list) { -list_del (&trans->list); +nft_trans_list_del (trans);nft_commit_release (trans); } }
@@ -8019,6 +8034,18 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)return 0 ; } +list_for_each_entry (trans, &nft_net->binding_list, binding_list) { +switch (trans->msg_type) { +case NFT_MSG_NEWSET : +if (nft_set_is_anonymous (nft_trans_set (trans)) && + !nft_trans_set_bound (trans)) { +pr_warn_once ("nftables ruleset with unbound set\n" ); +return -EINVAL ; + } +break ; + } + } +/* 0. Validate ruleset, otherwise roll back for error reporting. */ if (nf_tables_validate (net) <0 )return -EAGAIN ;
@@ -8421,7 +8448,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)list_for_each_entry_safe_reverse (trans, next, &nft_net->commit_list, list) { -list_del (&trans->list); +nft_trans_list_del (trans);nf_tables_abort_release (trans); }
@@ -9120,6 +9147,7 @@ static int __net_init nf_tables_init_net(struct net *net)INIT_LIST_HEAD (&nft_net->tables);INIT_LIST_HEAD (&nft_net->commit_list); +INIT_LIST_HEAD (&nft_net->binding_list);INIT_LIST_HEAD (&nft_net->module_list);INIT_LIST_HEAD (&nft_net->notify_list);mutex_init (&nft_net->commit_mutex);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 7/11 netfilter: nf_tables: reject unbound chain set before commit phase
In reply to Pablo Neira Ayuso[ 62e1e94b246e685d89c3163aaef4b160e42ceb02 ]
Use binding list to track set transaction and to check for unbound chains before entering the commit phase.
Bail out if chain binding remain unused before entering the commit step.
--- net/netfilter/nf_tables_api.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
net/netfilter/nf_tables_api.c +13 -0
@@ -360,6 +360,11 @@ static void nft_trans_commit_list_add_tail(struct net *net, struct nft_trans *trif (nft_set_is_anonymous (nft_trans_set (trans)))list_add_tail (&trans->binding_list, &nft_net->binding_list);break ; +case NFT_MSG_NEWCHAIN : +if (!nft_trans_chain_update (trans) && +nft_chain_binding (nft_trans_chain (trans))) +list_add_tail (&trans->binding_list, &nft_net->binding_list); +break ; }list_add_tail (&trans->list, &nft_net->commit_list);
@@ -8043,6 +8048,14 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)return -EINVAL ; }break ; +case NFT_MSG_NEWCHAIN : +if (!nft_trans_chain_update (trans) && +nft_chain_binding (nft_trans_chain (trans)) && + !nft_trans_chain_bound (trans)) { +pr_warn_once ("nftables ruleset with unbound chain\n" ); +return -EINVAL ; + } +break ; } }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 8/11 netfilter: nftables: rename set element data activation/deactivation functions
In reply to Pablo Neira Ayuso[ f8bb7889af58d8e74d2d61c76b1418230f1610fa ]
Rename:
- nft_set_elem_activate() to nft_set_elem_data_activate().
- nft_set_elem_deactivate() to nft_set_elem_data_deactivate().
To prepare for updates in the set element infrastructure to add support for the special catch-all element.
--- net/netfilter/nf_tables_api.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
net/netfilter/nf_tables_api.c +11 -11
@@ -5270,8 +5270,8 @@ void nft_set_elem_destroy(const struct nft_set *set, void *elem, }EXPORT_SYMBOL_GPL (nft_set_elem_destroy); -/* Only called from commit path, nft_set_elem_deactivate() already deals with -* the refcounting from the preparation phase. +/* Only called from commit path, nft_setelem_data_deactivate() already deals +* with the refcounting from the preparation phase. */ static void nf_tables_set_elem_destroy (const struct nft_ctx *ctx,const struct nft_set *set,void *elem)
@@ -5649,9 +5649,9 @@ void nft_data_hold(const struct nft_data *data, enum nft_data_types type) } } -static void nft_set_elem_activate (const struct net *net, -const struct nft_set *set, -struct nft_set_elem *elem) +static void nft_setelem_data_activate (const struct net *net, +const struct nft_set *set, +struct nft_set_elem *elem) {const struct nft_set_ext *ext =nft_set_elem_ext (set, elem->priv);
@@ -5661,9 +5661,9 @@ static void nft_set_elem_activate(const struct net *net, (*nft_set_ext_obj (ext))->use++; } -static void nft_set_elem_deactivate (const struct net *net, -const struct nft_set *set, -struct nft_set_elem *elem) +static void nft_setelem_data_deactivate (const struct net *net, +const struct nft_set *set, +struct nft_set_elem *elem) {const struct nft_set_ext *ext =nft_set_elem_ext (set, elem->priv);
@@ -5740,7 +5740,7 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,kfree (elem.priv); elem.priv = priv; -nft_set_elem_deactivate (ctx->net, set, &elem); +nft_setelem_data_deactivate (ctx->net, set, &elem);nft_trans_elem (trans) = elem;nft_trans_commit_list_add_tail (ctx->net, trans);
@@ -5774,7 +5774,7 @@ static int nft_flush_set(const struct nft_ctx *ctx, } set->ndeact++; -nft_set_elem_deactivate (ctx->net, set, elem); +nft_setelem_data_deactivate (ctx->net, set, elem);nft_trans_elem_set (trans) = set;nft_trans_elem (trans) = *elem;nft_trans_commit_list_add_tail (ctx->net, trans);
@@ -8413,7 +8413,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)case NFT_MSG_DELSETELEM : te = (struct nft_trans_elem *)trans->data; -nft_set_elem_activate (net, te->set, &te->elem); +nft_setelem_data_activate (net, te->set, &te->elem); te->set->ops->activate (net, te->set, &te->elem); te->set->ndeact--;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 9/11 netfilter: nf_tables: drop map element references from preparation phase
In reply to Pablo Neira Ayuso[ 628bd3e49cba1c066228e23d71a852c23e26da73 ]
set .destroy callback releases the references to other objects in maps. This is very late and it results in spurious EBUSY errors. Drop refcount from the preparation phase instead, update set backend not to drop reference counter from set .destroy path.
Exceptions: NFT_TRANS_PREPARE_ERROR does not require to drop the reference counter because the transaction abort path releases the map references for each element since the set is unbound. The abort path also deals with releasing reference counter for new elements added to unbound sets.
--- include/net/netfilter/nf_tables.h | 5 +- net/netfilter/nf_tables_api.c | 119 +++++++++++++++++++++++++++--- net/netfilter/nft_set_bitmap.c | 5 +- net/netfilter/nft_set_hash.c | 23 ++++-- net/netfilter/nft_set_pipapo.c | 14 ++-- net/netfilter/nft_set_rbtree.c | 5 +- 6 files changed, 147 insertions(+), 24 deletions(-)
include/net/netfilter/nf_tables.h +4 -1
@@ -382,7 +382,8 @@ struct nft_set_ops {int (*init)(const struct nft_set *set,const struct nft_set_desc *desc,const struct nlattr *const nla[]); -void (*destroy)(const struct nft_set *set); +void (*destroy)(const struct nft_ctx *ctx, +const struct nft_set *set);void (*gc_init)(const struct nft_set *set);unsigned int elemsize;
@@ -686,6 +687,8 @@ void *nft_set_elem_init(const struct nft_set *set, u64 timeout, u64 expiration, gfp_t gfp);void nft_set_elem_destroy (const struct nft_set *set,void *elem,bool destroy_expr); +void nf_tables_set_elem_destroy (const struct nft_ctx *ctx, +const struct nft_set *set,void *elem);/** * struct nft_set_gc_batch_head - nf_tables set garbage collection batch
net/netfilter/nf_tables_api.c +110 -9
194 lines not on this page · raw message
net/netfilter/nft_set_bitmap.c +3 -2
@@ -270,13 +270,14 @@ static int nft_bitmap_init(const struct nft_set *set,return 0 ; } -static void nft_bitmap_destroy (const struct nft_set *set) +static void nft_bitmap_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_bitmap *priv =nft_set_priv (set);struct nft_bitmap_elem *be, *n;list_for_each_entry_safe (be, n, &priv->list, head) -nft_set_elem_destroy (set, be, true); +nf_tables_set_elem_destroy (ctx, set, be); } static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features,
net/netfilter/nft_set_hash.c +18 -5
@@ -380,19 +380,31 @@ static int nft_rhash_init(const struct nft_set *set,return 0 ; } +struct nft_rhash_ctx { +const struct nft_ctx ctx; +const struct nft_set *set; +}; +static void nft_rhash_elem_destroy (void *ptr,void *arg) { -nft_set_elem_destroy (arg, ptr, true); +struct nft_rhash_ctx *rhash_ctx = arg; + +nf_tables_set_elem_destroy (&rhash_ctx->ctx, rhash_ctx->set, ptr); } -static void nft_rhash_destroy (const struct nft_set *set) +static void nft_rhash_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_rhash *priv =nft_set_priv (set); +struct nft_rhash_ctx rhash_ctx = { + .ctx = *ctx, + .set = set, + };cancel_delayed_work_sync (&priv->gc_work);rcu_barrier ();rhashtable_free_and_destroy (&priv->ht, nft_rhash_elem_destroy, - (void *)set); + (void *)&rhash_ctx); }/* Number of buckets is stored in u32, so cap our result to 1U<<31 */
@@ -621,7 +633,8 @@ static int nft_hash_init(const struct nft_set *set,return 0 ; } -static void nft_hash_destroy (const struct nft_set *set) +static void nft_hash_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_hash *priv =nft_set_priv (set);struct nft_hash_elem *he;
@@ -631,7 +644,7 @@ static void nft_hash_destroy(const struct nft_set *set)for (i =0 ; i < priv->buckets; i++) {hlist_for_each_entry_safe (he, next, &priv->table[i], node) {hlist_del_rcu (&he->node); -nft_set_elem_destroy (set, he, true); +nf_tables_set_elem_destroy (ctx, set, he); } } }
net/netfilter/nft_set_pipapo.c +9 -5
@@ -2127,10 +2127,12 @@ static int nft_pipapo_init(const struct nft_set *set,/** * nft_set_pipapo_match_destroy() - Destroy elements from key mapping array +* @ctx: context * @set: nftables API set representation * @m: matching data pointing to key mapping array */ -static void nft_set_pipapo_match_destroy (const struct nft_set *set, +static void nft_set_pipapo_match_destroy (const struct nft_ctx *ctx, +const struct nft_set *set,struct nft_pipapo_match *m) {struct nft_pipapo_field *f;
@@ -2147,15 +2149,17 @@ static void nft_set_pipapo_match_destroy(const struct nft_set *set, e = f->mt[r].e; -nft_set_elem_destroy (set, e, true); +nf_tables_set_elem_destroy (ctx, set, e); } }/** * nft_pipapo_destroy() - Free private data for set and all committed elements +* @ctx: context * @set: nftables API set representation */ -static void nft_pipapo_destroy (const struct nft_set *set) +static void nft_pipapo_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_pipapo *priv =nft_set_priv (set);struct nft_pipapo_match *m;
@@ -2165,7 +2169,7 @@ static void nft_pipapo_destroy(const struct nft_set *set)if (m) {rcu_barrier (); -nft_set_pipapo_match_destroy (set, m); +nft_set_pipapo_match_destroy (ctx, set, m);#ifdef NFT_PIPAPO_ALIGN free_percpu (m->scratch_aligned);
@@ -2182,7 +2186,7 @@ static void nft_pipapo_destroy(const struct nft_set *set) m = priv->clone;if (priv->dirty) -nft_set_pipapo_match_destroy (set, m); +nft_set_pipapo_match_destroy (ctx, set, m);#ifdef NFT_PIPAPO_ALIGN free_percpu (priv->clone->scratch_aligned);
net/netfilter/nft_set_rbtree.c +3 -2
@@ -657,7 +657,8 @@ static int nft_rbtree_init(const struct nft_set *set,return 0 ; } -static void nft_rbtree_destroy (const struct nft_set *set) +static void nft_rbtree_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_rbtree *priv =nft_set_priv (set);struct nft_rbtree_elem *rbe;
@@ -668,7 +669,7 @@ static void nft_rbtree_destroy(const struct nft_set *set)while ((node = priv->root.rb_node) !=NULL ) {rb_erase (node, &priv->root); rbe = rb_entry(node, struct nft_rbtree_elem, node); -nft_set_elem_destroy (set, rbe, true); +nf_tables_set_elem_destroy (ctx, set, rbe); } }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 10/11 netfilter: nf_tables: unbind non-anonymous set if rule construction fails
In reply to Pablo Neira Ayuso[ 3e70489721b6c870252c9082c496703677240f53 ]
Otherwise a dangling reference to a rule object that is gone remains in the set binding list.
--- net/netfilter/nf_tables_api.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nf_tables_api.c +2 -0
@@ -4719,6 +4719,8 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,nft_set_trans_unbind (ctx, set);if (nft_set_is_anonymous (set))nft_deactivate_next (ctx->net, set); +else +list_del_rcu (&binding->list); set->use--;break ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 11/11 netfilter: nf_tables: fix scheduling-while-atomic splat
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
[ 2024439bd5ceb145eeeb428b2a59e9b905153ac3 ]
nf_tables_check_loops() can be called from rhashtable list walk so cond_resched() cannot be used here.
--- net/netfilter/nf_tables_api.c | 4 ---- 1 file changed, 4 deletions(-)
net/netfilter/nf_tables_api.c +0 -4
@@ -8714,13 +8714,9 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,break ; } } - -cond_resched (); }list_for_each_entry (set, &ctx->table->sets, list) { -cond_resched (); -if (!nft_is_active_next (ctx->net, set))continue ; if (!(set->flags & NFT_SET_MAP) ||
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerHi,
Quoted 3 lines · Pablo Neira Ayuso
Hi Greg, Sasha,
[ This is v2 appends patch #11
f838e0906dd3as Florian suggested. ]
^^^^^^^^^^^^
this should be 2024439bd5ce instead
Quoted 17 lines
The following list shows the backported patches, I am using original commit IDs for reference:
1)
0854db2aaef3("netfilter:nf_tables: usenet_genericinfra for transaction data")2)
81ea01066741("netfilter:nf_tables: add rescheduling points during loop detection walks")3)
1240eb93f061("netfilter:nf_tables: incorrect error path handling withNFT_MSG_NEWRULE")4)
4bedf9eee016("netfilter:nf_tables: fix chain binding transaction logic")5)
26b5a5712eb8("netfilter:nf_tables: addNFT_TRANS_PREPARE_ERRORto deal with bound set/chain")6)
938154b93be8("netfilter:nf_tables: reject unbound anonymous set before commit phase")7)
62e1e94b246e("netfilter:nf_tables: reject unbound chain set before commit phase")
Quoted 7 lines
8)
f8bb7889af58("netfilter: nftables: rename set element data activation/deactivation functions")9)
628bd3e49cba("netfilter:nf_tables: drop map element references from preparation phase")10)
3e70489721b6("netfilter:nf_tables: unbind non-anonymous set if rule construction fails")11)
f838e0906dd3("netfilter:nf_tables: fix scheduling-while-atomic splat")
Nitpick, incorrect original commit in this cover letter patch #11:
11) 2024439bd5ce ("netfilter: nf_tables: fix scheduling-while-atomic splat")
Backport of patch #11 already points to the valid original commit.
Quoted 39 lines
Note:
- Patch #1 is a backported dependency patch required by these fixes.
- Patch #2 needs a follow up fix coming in this series as patch #11.Please, apply,
Thanks.Florian Westphal (3):
netfilter:nf_tables: usenet_genericinfra for transaction data
netfilter:nf_tables: add rescheduling points during loop detection walks
netfilter:nf_tables: fix scheduling-while-atomic splatPablo Neira Ayuso (8):
netfilter:nf_tables: incorrect error path handling withNFT_MSG_NEWRULE
netfilter:nf_tables: fix chain binding transaction logic
netfilter:nf_tables: addNFT_TRANS_PREPARE_ERRORto deal with bound set/chain
netfilter:nf_tables: reject unbound anonymous set before commit phase
netfilter:nf_tables: reject unbound chain set before commit phase
netfilter: nftables: rename set element data activation/deactivation functions
netfilter:nf_tables: drop map element references from preparation phase
netfilter:nf_tables: unbind non-anonymous set if rule construction failsinclude/net/netfilter/nf_tables.h | 41 +- include/net/netns/nftables.h | 7 - net/netfilter/nf_tables_api.c | 692 +++++++++++++++++++++--------- net/netfilter/nf_tables_offload.c | 30 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_dynset.c | 6 +- net/netfilter/nft_immediate.c | 90 +++- net/netfilter/nft_set_bitmap.c | 5 +- net/netfilter/nft_set_hash.c | 23 +- net/netfilter/nft_set_pipapo.c | 14 +- net/netfilter/nft_set_rbtree.c | 5 +- 11 files changed, 678 insertions(+), 246 deletions(-)Signature · 1 line
2.30.2