Netfilter fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) Fix NAT support for NFPROTO_INET without layer 3 address, from Florian Westphal.
2) Use kfree_rcu(ptr, rcu) variant in nf_tables clean_net path.
3) Use list to collect flowtable hooks to be deleted.
4) Initialize list of hook field in flowtable transaction.
5) Release hooks on error for flowtable updates.
6) Memleak in hardware offload rule commit and abort paths.
7) Early bail out in case device does not support for hardware offload. This adds a new interface to net/core/flow_offload.c to check if the flow indirect block list is empty.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit 0a375c822497ed6ad6b5da0792a12a6f1af10c0b:
tcp: tcp_rtx_synack() can be called from process context (2022-05-31 21:40:10 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git HEAD
for you to fetch changes up to 3a41c64d9c1185a2f3a184015e2a9b78bfc99c71:
netfilter: nf_tables: bail out early if hardware offload is not supported (2022-06-06 19:19:15 +0200)
----------------------------------------------------------------
Florian Westphal (1):
netfilter: nat: really support inet nat without l3 address
Pablo Neira Ayuso (6):
netfilter: nf_tables: use kfree_rcu(ptr, rcu) to release hooks in clean_net path
netfilter: nf_tables: delete flowtable hooks via transaction list
netfilter: nf_tables: always initialize flowtable hook list in transaction
netfilter: nf_tables: release new hooks on unsupported flowtable flags
netfilter: nf_tables: memleak flow rule from commit path
netfilter: nf_tables: bail out early if hardware offload is not supported
include/net/flow_offload.h | 1 + include/net/netfilter/nf_tables.h | 1 - include/net/netfilter/nf_tables_offload.h | 2 +- net/core/flow_offload.c | 6 ++++ net/netfilter/nf_tables_api.c | 54 ++++++++++++---------------- net/netfilter/nf_tables_offload.c | 23 +++++++++++- net/netfilter/nft_nat.c | 3 +- tools/testing/selftests/netfilter/nft_nat.sh | 43 ++++++++++++++++++++++ 8 files changed, 98 insertions(+), 35 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/7 netfilter: nat: really support inet nat without l3 address
From: Florian Westphal <[email protected]>
When no l3 address is given, priv->family is set to NFPROTO_INET and the evaluation function isn't called.
Call it too so l4-only rewrite can work.
Also add a test case for this.
--- net/netfilter/nft_nat.c | 3 +- tools/testing/selftests/netfilter/nft_nat.sh | 43 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-)
net/netfilter/nft_nat.c +2 -1
@@ -335,7 +335,8 @@ static void nft_nat_inet_eval(const struct nft_expr *expr, {const struct nft_nat *priv =nft_expr_priv (expr); -if (priv->family ==nft_pf (pkt)) +if (priv->family ==nft_pf (pkt) || + priv->family ==NFPROTO_INET )nft_nat_eval (expr, regs, pkt); }
tools/testing/selftests/netfilter/nft_nat.sh +43 -0
55 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH net 1/7] netfilter: nat: really support inet nat without l3 address
This series was applied to netdev/net.git (master) by Pablo Neira Ayuso <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Pablo Neira Ayuso <[email protected]>:
Quoted 9 lines · On Mon, 6 Jun 2022 23:20:49 +0200 you wrote:
From: Florian Westphal <[email protected]>
When no l3 address is given,
priv->familyis set toNFPROTO_INETand the evaluation function isn't called.Call it too so l4-only rewrite can work.
Also add a test case for this.[...]
Here is the summary with links:
- [net,1/7] netfilter: nat: really support inet nat without l3 address
https://git.kernel.org/netdev/net/c/282e5f8fe907 - [net,2/7] netfilter: nf_tables: use kfree_rcu(ptr, rcu) to release hooks in clean_net path https://git.kernel.org/netdev/net/c/ab5e5c062f67 - [net,3/7] netfilter: nf_tables: delete flowtable hooks via transaction list https://git.kernel.org/netdev/net/c/b6d9014a3335 - [net,4/7] netfilter: nf_tables: always initialize flowtable hook list in transaction https://git.kernel.org/netdev/net/c/2c9e4559773c - [net,5/7] netfilter: nf_tables: release new hooks on unsupported flowtable flags https://git.kernel.org/netdev/net/c/c271cc9febaa - [net,6/7] netfilter: nf_tables: memleak flow rule from commit path https://git.kernel.org/netdev/net/c/9dd732e0bdf5 - [net,7/7] netfilter: nf_tables: bail out early if hardware offload is not supported https://git.kernel.org/netdev/net/c/3a41c64d9c11
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Pablo Neira Ayuso
maintainerPATCH 2/7 netfilter: nf_tables: use kfree_rcu(ptr, rcu) to release hooks in clean_net path
In reply to Pablo Neira AyusoUse kfree_rcu(ptr, rcu) variant instead as described by ae089831ff28 ("netfilter: nf_tables: prefer kfree_rcu(ptr, rcu) variant").
--- net/netfilter/nf_tables_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +1 -1
@@ -7332,7 +7332,7 @@ static void __nft_unregister_flowtable_net_hooks(struct net *net,nf_unregister_net_hook (net, &hook->ops);if (release_netdev) {list_del (&hook->list); -kfree_rcu (hook); +kfree_rcu (hook, rcu); } } }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/7 netfilter: nf_tables: delete flowtable hooks via transaction list
In reply to Pablo Neira AyusoRemove inactive bool field in nft_hook object that was introduced in abadb2f865d7 ("netfilter: nf_tables: delete devices from flowtable"). Move stale flowtable hooks to transaction list instead.
Deleting twice the same device does not result in ENOENT.
--- include/net/netfilter/nf_tables.h | 1 - net/netfilter/nf_tables_api.c | 31 ++++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-)
include/net/netfilter/nf_tables.h +0 -1
@@ -1090,7 +1090,6 @@ struct nft_stats {struct nft_hook {struct list_head list; -bool inactive;struct nf_hook_ops ops;struct rcu_head rcu; };
net/netfilter/nf_tables_api.c +6 -25
@@ -1914,7 +1914,6 @@ static struct nft_hook *nft_netdev_hook_alloc(struct net *net, goto err_hook_dev; } hook->ops.dev = dev; - hook->inactive = false;return hook;
@@ -7618,6 +7617,7 @@ static int nft_delflowtable_hook(struct nft_ctx *ctx, {const struct nlattr *const *nla = ctx->nla;struct nft_flowtable_hook flowtable_hook; +LIST_HEAD (flowtable_del_list);struct nft_hook *this, *hook;struct nft_trans *trans;int err;
@@ -7633,7 +7633,7 @@ static int nft_delflowtable_hook(struct nft_ctx *ctx, err = -ENOENT ; goto err_flowtable_del_hook; } - hook->inactive = true; +list_move (&hook->list, &flowtable_del_list); } trans = nft_trans_alloc(ctx, NFT_MSG_DELFLOWTABLE,
@@ -7646,6 +7646,7 @@ static int nft_delflowtable_hook(struct nft_ctx *ctx,nft_trans_flowtable (trans) = flowtable;nft_trans_flowtable_update (trans) = true;INIT_LIST_HEAD (&nft_trans_flowtable_hooks (trans)); +list_splice (&flowtable_del_list, &nft_trans_flowtable_hooks (trans));nft_flowtable_hook_release (&flowtable_hook);nft_trans_commit_list_add_tail (ctx->net, trans);
@@ -7653,13 +7654,7 @@ static int nft_delflowtable_hook(struct nft_ctx *ctx,return 0 ; err_flowtable_del_hook: -list_for_each_entry (this, &flowtable_hook.list, list) { - hook =nft_hook_list_find (&flowtable->hook_list, this); -if (!hook) -break ; - - hook->inactive = false; - } +list_splice (&flowtable_del_list, &flowtable->hook_list);nft_flowtable_hook_release (&flowtable_hook);return err;
@@ -8563,17 +8558,6 @@ void nft_chain_del(struct nft_chain *chain)list_del_rcu (&chain->list); } -static void nft_flowtable_hooks_del (struct nft_flowtable *flowtable, -struct list_head *hook_list) -{ -struct nft_hook *hook, *next; - -list_for_each_entry_safe (hook, next, &flowtable->hook_list, list) { -if (hook->inactive) -list_move (&hook->list, hook_list); - } -} -static void nf_tables_module_autoload_cleanup (struct net *net) {struct nftables_pernet *nft_net =nft_pernet (net);
@@ -8918,8 +8902,6 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)break ;case NFT_MSG_DELFLOWTABLE :if (nft_trans_flowtable_update (trans)) { -nft_flowtable_hooks_del (nft_trans_flowtable (trans), - &nft_trans_flowtable_hooks (trans)); nf_tables_flowtable_notify(&trans->ctx, nft_trans_flowtable(trans), &nft_trans_flowtable_hooks(trans),
@@ -9000,7 +8982,6 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)struct nftables_pernet *nft_net =nft_pernet (net);struct nft_trans *trans, *next;struct nft_trans_elem *te; -struct nft_hook *hook;if (action ==NFNL_ABORT_VALIDATE &&nf_tables_validate (net) <0 )
@@ -9131,8 +9112,8 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)break ;case NFT_MSG_DELFLOWTABLE :if (nft_trans_flowtable_update (trans)) { -list_for_each_entry (hook, &nft_trans_flowtable (trans)->hook_list, list) - hook->inactive = false; +list_splice (&nft_trans_flowtable_hooks (trans), + &nft_trans_flowtable (trans)->hook_list); }else { trans->ctx.table->use++;nft_clear (trans->ctx.net,nft_trans_flowtable (trans));
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/7 netfilter: nf_tables: always initialize flowtable hook list in transaction
In reply to Pablo Neira AyusoThe hook list is used if nft_trans_flowtable_update(trans) == true. However, initialize this list for other cases for safety reasons.
--- net/netfilter/nf_tables_api.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_tables_api.c +1 -0
@@ -544,6 +544,7 @@ static int nft_trans_flowtable_add(struct nft_ctx *ctx, int msg_type,if (msg_type ==NFT_MSG_NEWFLOWTABLE )nft_activate_next (ctx->net, flowtable); +INIT_LIST_HEAD (&nft_trans_flowtable_hooks (trans));nft_trans_flowtable (trans) = flowtable;nft_trans_commit_list_add_tail (ctx->net, trans);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 5/7 netfilter: nf_tables: release new hooks on unsupported flowtable flags
In reply to Pablo Neira AyusoRelease the list of new hooks that are pending to be registered in case that unsupported flowtable flags are provided.
--- net/netfilter/nf_tables_api.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +8 -4
@@ -7433,11 +7433,15 @@ static int nft_flowtable_update(struct nft_ctx *ctx, const struct nlmsghdr *nlh,if (nla[NFTA_FLOWTABLE_FLAGS ]) { flags =ntohl (nla_get_be32 (nla[NFTA_FLOWTABLE_FLAGS ])); -if (flags & ~NFT_FLOWTABLE_MASK ) -return -EOPNOTSUPP ; +if (flags & ~NFT_FLOWTABLE_MASK ) { + err = -EOPNOTSUPP ; + goto err_flowtable_update_hook; + }if ((flowtable->data.flags &NFT_FLOWTABLE_HW_OFFLOAD ) ^ - (flags &NFT_FLOWTABLE_HW_OFFLOAD )) -return -EOPNOTSUPP ; + (flags &NFT_FLOWTABLE_HW_OFFLOAD )) { + err = -EOPNOTSUPP ; + goto err_flowtable_update_hook; + } }else { flags = flowtable->data.flags; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 6/7 netfilter: nf_tables: memleak flow rule from commit path
In reply to Pablo Neira AyusoAbort path release flow rule object, however, commit path does not. Update code to destroy these objects before releasing the transaction.
--- net/netfilter/nf_tables_api.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/nf_tables_api.c +6 -0
@@ -8329,6 +8329,9 @@ static void nft_commit_release(struct nft_trans *trans)nf_tables_chain_destroy (&trans->ctx);break ;case NFT_MSG_DELRULE : +if (trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD ) +nft_flow_rule_destroy (nft_trans_flow_rule (trans)); +nf_tables_rule_destroy (&trans->ctx,nft_trans_rule (trans));break ;case NFT_MSG_DELSET :
@@ -8817,6 +8820,9 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)nf_tables_rule_notify (&trans->ctx,nft_trans_rule (trans),NFT_MSG_NEWRULE ); +if (trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD ) +nft_flow_rule_destroy (nft_trans_flow_rule (trans)); +nft_trans_destroy (trans);break ;case NFT_MSG_DELRULE :
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 7/7 netfilter: nf_tables: bail out early if hardware offload is not supported
In reply to Pablo Neira AyusoIf user requests for NFT_CHAIN_HW_OFFLOAD, then check if either device provides the .ndo_setup_tc interface or there is an indirect flow block that has been registered. Otherwise, bail out early from the preparation phase. Moreover, validate that family == NFPROTO_NETDEV and hook is NF_NETDEV_INGRESS.
--- include/net/flow_offload.h | 1 + include/net/netfilter/nf_tables_offload.h | 2 +- net/core/flow_offload.c | 6 ++++++ net/netfilter/nf_tables_api.c | 2 +- net/netfilter/nf_tables_offload.c | 23 ++++++++++++++++++++++- 5 files changed, 31 insertions(+), 3 deletions(-)
include/net/flow_offload.h +1 -0
@@ -612,5 +612,6 @@ int flow_indr_dev_setup_offload(struct net_device *dev, struct Qdisc *sch, enum tc_setup_type type, void *data, struct flow_block_offload *bo, void (*cleanup)(struct flow_block_cb *block_cb)); +bool flow_indr_dev_exists (void );#endif /* _NET_FLOW_OFFLOAD_H */
include/net/netfilter/nf_tables_offload.h +1 -1
@@ -92,7 +92,7 @@ int nft_flow_rule_offload_commit(struct net *net); NFT_OFFLOAD_MATCH(__key, __base, __field, __len, __reg) \memset (&(__reg)->mask,0xff , (__reg)->len); -int nft_chain_offload_priority (struct nft_base_chain *basechain); +bool nft_chain_offload_support (const struct nft_base_chain *basechain);int nft_offload_init (void );void nft_offload_exit (void );
net/core/flow_offload.c +6 -0
@@ -595,3 +595,9 @@ int flow_indr_dev_setup_offload(struct net_device *dev, struct Qdisc *sch,return (bo &&list_empty (&bo->cb_list)) ? -EOPNOTSUPP : count; }EXPORT_SYMBOL (flow_indr_dev_setup_offload); + +bool flow_indr_dev_exists (void ) +{ +return !list_empty (&flow_block_indr_dev_list); +} +EXPORT_SYMBOL (flow_indr_dev_exists);
net/netfilter/nf_tables_api.c +1 -1
@@ -2166,7 +2166,7 @@ static int nft_basechain_init(struct nft_base_chain *basechain, u8 family, chain->flags |=NFT_CHAIN_BASE | flags; basechain->policy =NF_ACCEPT ;if (chain->flags &NFT_CHAIN_HW_OFFLOAD && -nft_chain_offload_priority (basechain) <0 ) + !nft_chain_offload_support (basechain))return -EOPNOTSUPP ;flow_block_init (&basechain->flow_block);
net/netfilter/nf_tables_offload.c +22 -1
@@ -208,7 +208,7 @@ static int nft_setup_cb_call(enum tc_setup_type type, void *type_data,return 0 ; } -int nft_chain_offload_priority (struct nft_base_chain *basechain) +static int nft_chain_offload_priority (const struct nft_base_chain *basechain) {if (basechain->ops.priority <=0 || basechain->ops.priority >USHRT_MAX )
@@ -217,6 +217,27 @@ int nft_chain_offload_priority(struct nft_base_chain *basechain)return 0 ; } +bool nft_chain_offload_support (const struct nft_base_chain *basechain) +{ +struct net_device *dev; +struct nft_hook *hook; + +if (nft_chain_offload_priority (basechain) <0 ) +return false; + +list_for_each_entry (hook, &basechain->hook_list, list) { +if (hook->ops.pf !=NFPROTO_NETDEV || + hook->ops.hooknum !=NF_NETDEV_INGRESS ) +return false; + + dev = hook->ops.dev; +if (!dev->netdev_ops->ndo_setup_tc && !flow_indr_dev_exists ()) +return false; + } + +return true; +} + static void nft_flow_cls_offload_setup(struct flow_cls_offload *cls_flow, const struct nft_base_chain *basechain, const struct nft_rule *rule,
Signature · 1 line
2.30.2
Jakub Kicinski
maintainerRe: [PATCH net 7/7] netfilter: nf_tables: bail out early if hardware offload is not supported
Quoted 5 lines · On Mon, 6 Jun 2022 23:20:55 +0200 Pablo Neira Ayuso wrote:
If user requests for
NFT_CHAIN_HW_OFFLOAD, then check if either device provides the .ndo_setup_tc interface or there is an indirect flow block that has been registered. Otherwise, bail out early from the preparation phase. Moreover, validate that family ==NFPROTO_NETDEVand hook isNF_NETDEV_INGRESS.
The whole series is pretty light on the "why". This patch is particularly bad, no idea what the user visible bug was here.
Pablo Neira Ayuso
maintainerRe: [PATCH net 7/7] netfilter: nf_tables: bail out early if hardware offload is not supported
Hi Jakub,
Quoted 8 lines · Jakub Kicinski
Quoted 5 lines · On Mon, 6 Jun 2022 23:20:55 +0200 Pablo Neira Ayuso wrote:
If user requests for
NFT_CHAIN_HW_OFFLOAD, then check if either device provides the .ndo_setup_tc interface or there is an indirect flow block that has been registered. Otherwise, bail out early from the preparation phase. Moreover, validate that family ==NFPROTO_NETDEVand hook isNF_NETDEV_INGRESS.The whole series is pretty light on the "why".
- [net,1/7] netfilter: nat: really support inet nat without l3 address
https://git.kernel.org/netdev/net/c/282e5f8fe907
This is a fix, otherwise NAT with the inet family (which allows both IPv4 and IPv6 traffic) remains broken. It's a datapath fix, the control plane was accepting the rule, however NAT was not applied if user specified no layer 4 address, which might happen for, eg. redirect.
- [net,2/7] netfilter: nf_tables: use kfree_rcu(ptr, rcu) to release hooks in clean_net path
https://git.kernel.org/netdev/net/c/ab5e5c062f67
This is an incremental fix for f9a43007d3f7 ("netfilter: nf_tables:
double hook unregistration in netns path"), it is using kfree_rcu(ptr) variant which works but it has some limitations. Use of free_rcu(ptr) was not intentional, hence free_rcu(ptr, rcu)
- [net,3/7] netfilter: nf_tables: delete flowtable hooks via transaction list
https://git.kernel.org/netdev/net/c/b6d9014a3335
Deleting twice the same device on the flowtable might lead to ENOENT since hook->inactive is not honored. Instead of honoring such flag, this patch is fixing up this by using a flowtable hook list in the transaction object to convey the hook that are going to be deleted which looks cleaner to me.
- [net,4/7] netfilter: nf_tables: always initialize flowtable hook list in transaction
https://git.kernel.org/netdev/net/c/2c9e4559773c
This is a oneliner, not urgent but Florian already reported in the past that the flowtable hook list in the transaction object was not initialized (even if not used). This patch initializes it to increase robustness, this list is going to be empty/unused for the non-update path anyway. Arguably I could have postpone this oneliner.
- [net,5/7] netfilter: nf_tables: release new hooks on unsupported flowtable flags
https://git.kernel.org/netdev/net/c/c271cc9febaa
This is a fix. nft_flowtable_parse_hook() populates the hook list, but the flowtable flags update logic was not releasing these objects from the error path, hence, leading to a memleak.
- [net,6/7] netfilter: nf_tables: memleak flow rule from commit path
https://git.kernel.org/netdev/net/c/9dd732e0bdf5
kmemleak reported this memleak while running a series of test with nf_tables hardware offload support for these objects, this is a fix.
Quoted 2 lines
This patch is particularly bad, no idea what the user visible bug was here.
Are you refering to this?
- [net,7/7] netfilter: nf_tables: bail out early if hardware offload is not supported
https://git.kernel.org/netdev/net/c/3a41c64d9c11
Arguably, I could have postponed this patch, but quite recently there was a silly bug in the hardware offload infrastructure, see b1a5983f56e3 ("netfilter: nf_tables_offload: incorrect flow offload action array size. The reporter triggered the bug with the _loopback interface_, he wondered why this infrastructure is exposed to all devices while only a dozen of NICs support hardware offload, hence this patch to disable hardware offload earlier in the control plane path.