netfilter: nf_tables: extended netlink error reporting for netdevice
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v5 5/7 netfilter: nf_tables: support for deleting devices in an existing netdev chain
In reply to Pablo Neira AyusoThis patch allows for deleting devices in an existing netdev chain.
---
v5: null changes
net/netfilter/nf_tables_api.c | 99 +++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 11 deletions(-)
net/netfilter/nf_tables_api.c +88 -11
@@ -1647,7 +1647,7 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net, NFTA_CHAIN_PAD)) goto nla_put_failure; -if (event ==NFT_MSG_DELCHAIN ) { +if (event ==NFT_MSG_DELCHAIN && !hook_list) {nlmsg_end (skb, nlh);return 0 ; }
@@ -2667,6 +2667,59 @@ static int nf_tables_newchain(struct sk_buff *skb, const struct nfnl_info *info,return nf_tables_addchain (&ctx, family, genmask, policy, flags, extack); } +static int nft_delchain_hook (struct nft_ctx *ctx,struct nft_chain *chain, +struct netlink_ext_ack *extack) +{ +const struct nlattr *const *nla = ctx->nla; +struct nft_chain_hook chain_hook = {}; +struct nft_base_chain *basechain; +struct nft_hook *this, *hook; +LIST_HEAD (chain_del_list); +struct nft_trans *trans; +int err; + +if (!nft_is_base_chain (chain)) +return -EOPNOTSUPP ; + + basechain =nft_base_chain (chain); + err =nft_chain_parse_hook (ctx->net, basechain, nla, &chain_hook, + ctx->family, extack); +if (err <0 ) +return err; + +list_for_each_entry (this, &chain_hook.list, list) { + hook =nft_hook_list_find (&basechain->hook_list, this); +if (!hook) { + err = -ENOENT ; + goto err_chain_del_hook; + } +list_move (&hook->list, &chain_del_list); + } + + trans =nft_trans_alloc (ctx,NFT_MSG_DELCHAIN , +sizeof (struct nft_trans_chain )); +if (!trans) { + err = -ENOMEM ; + goto err_chain_del_hook; + } + +nft_trans_basechain (trans) = basechain; +nft_trans_chain_update (trans) = true; +INIT_LIST_HEAD (&nft_trans_chain_hooks (trans)); +list_splice (&chain_del_list, &nft_trans_chain_hooks (trans)); +nft_chain_release_hook (&chain_hook); + +nft_trans_commit_list_add_tail (ctx->net, trans); + +return 0 ; + +err_chain_del_hook: +list_splice (&chain_del_list, &basechain->hook_list); +nft_chain_release_hook (&chain_hook); + +return err; +} +static int nf_tables_delchain (struct sk_buff *skb,const struct nfnl_info *info,const struct nlattr *const nla[]) {
@@ -2707,12 +2760,19 @@ static int nf_tables_delchain(struct sk_buff *skb, const struct nfnl_info *info,return PTR_ERR (chain); } +nft_ctx_init (&ctx, net, skb, info->nlh, family, table, chain, nla); + +if (nla[NFTA_CHAIN_HOOK ]) { +if (chain->flags &NFT_CHAIN_HW_OFFLOAD ) +return -EOPNOTSUPP ; + +return nft_delchain_hook (&ctx, chain, extack); + } +if (info->nlh->nlmsg_flags &NLM_F_NONREC && chain->use >0 )return -EBUSY ; -nft_ctx_init (&ctx, net, skb, info->nlh, family, table, chain, nla); - use = chain->use;list_for_each_entry (rule, &chain->rules, list) {if (!nft_is_active_next (net, rule))
@@ -8810,7 +8870,10 @@ static void nft_commit_release(struct nft_trans *trans)break ;case NFT_MSG_DELCHAIN :case NFT_MSG_DESTROYCHAIN : -nf_tables_chain_destroy (&trans->ctx); +if (nft_trans_chain_update (trans)) +nft_hooks_destroy (&nft_trans_chain_hooks (trans)); +else +nf_tables_chain_destroy (&trans->ctx);break ;case NFT_MSG_DELRULE :case NFT_MSG_DESTROYRULE :
@@ -9304,11 +9367,20 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)break ;case NFT_MSG_DELCHAIN :case NFT_MSG_DESTROYCHAIN : -nft_chain_del (trans->ctx.chain); -nf_tables_chain_notify (&trans->ctx, trans->msg_type,NULL ); -nf_tables_unregister_hook (trans->ctx.net, - trans->ctx.table, - trans->ctx.chain); +if (nft_trans_chain_update (trans)) { +nf_tables_chain_notify (&trans->ctx,NFT_MSG_DELCHAIN , + &nft_trans_chain_hooks (trans)); +nft_netdev_unregister_hooks (net, + &nft_trans_chain_hooks (trans), + true); + }else { +nft_chain_del (trans->ctx.chain); +nf_tables_chain_notify (&trans->ctx,NFT_MSG_DELCHAIN , +NULL ); +nf_tables_unregister_hook (trans->ctx.net, + trans->ctx.table, + trans->ctx.chain); + }break ;case NFT_MSG_NEWRULE :nft_clear (trans->ctx.net,nft_trans_rule (trans));
@@ -9558,8 +9630,13 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)break ;case NFT_MSG_DELCHAIN :case NFT_MSG_DESTROYCHAIN : - trans->ctx.table->use++; -nft_clear (trans->ctx.net, trans->ctx.chain); +if (nft_trans_chain_update (trans)) { +list_splice (&nft_trans_chain_hooks (trans), + &nft_trans_basechain (trans)->hook_list); + }else { + trans->ctx.table->use++; +nft_clear (trans->ctx.net, trans->ctx.chain); + }nft_trans_destroy (trans);break ;case NFT_MSG_NEWRULE :
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v5 1/7 netfilter: nf_tables: extended netlink error reporting for netdevice
Flowtable and netdev chains are bound to one or several netdevice, extend netlink error reporting to specify the the netdevice that triggers the error.
---
v5: no changes
net/netfilter/nf_tables_api.c | 38 ++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 14 deletions(-)
net/netfilter/nf_tables_api.c +24 -14
@@ -1955,7 +1955,8 @@ static struct nft_hook *nft_hook_list_find(struct list_head *hook_list,static int nf_tables_parse_netdev_hooks (struct net *net,const struct nlattr *attr, -struct list_head *hook_list) +struct list_head *hook_list, +struct netlink_ext_ack *extack) {struct nft_hook *hook, *next;const struct nlattr *tmp;
@@ -1969,10 +1970,12 @@ static int nf_tables_parse_netdev_hooks(struct net *net, hook =nft_netdev_hook_alloc (net, tmp);if (IS_ERR (hook)) { +NL_SET_BAD_ATTR (extack, tmp); err =PTR_ERR (hook); goto err_hook; }if (nft_hook_list_find (hook_list, hook)) { +NL_SET_BAD_ATTR (extack, tmp);kfree (hook); err = -EEXIST ; goto err_hook;
@@ -2005,20 +2008,23 @@ struct nft_chain_hook {static int nft_chain_parse_netdev (struct net *net,struct nlattr *tb[], -struct list_head *hook_list) +struct list_head *hook_list, +struct netlink_ext_ack *extack) {struct nft_hook *hook;int err;if (tb[NFTA_HOOK_DEV ]) { hook =nft_netdev_hook_alloc (net, tb[NFTA_HOOK_DEV ]); -if (IS_ERR (hook)) +if (IS_ERR (hook)) { +NL_SET_BAD_ATTR (extack, tb[NFTA_HOOK_DEV ]);return PTR_ERR (hook); + }list_add_tail (&hook->list, hook_list); }else if (tb[NFTA_HOOK_DEVS ]) { err =nf_tables_parse_netdev_hooks (net, tb[NFTA_HOOK_DEVS ], - hook_list); + hook_list, extack);if (err <0 )return err;
@@ -2086,7 +2092,7 @@ static int nft_chain_parse_hook(struct net *net,INIT_LIST_HEAD (&hook->list);if (nft_base_chain_netdev (family, hook->num)) { - err =nft_chain_parse_netdev (net, ha, &hook->list); + err =nft_chain_parse_netdev (net, ha, &hook->list, extack);if (err <0 ) {module_put (type->owner);return err;
@@ -7568,7 +7574,8 @@ static const struct nla_policy nft_flowtable_hook_policy[NFTA_FLOWTABLE_HOOK_MAXstatic int nft_flowtable_parse_hook (const struct nft_ctx *ctx,const struct nlattr *attr,struct nft_flowtable_hook *flowtable_hook, -struct nft_flowtable *flowtable,bool add) +struct nft_flowtable *flowtable, +struct netlink_ext_ack *extack,bool add) {struct nlattr *tb[NFTA_FLOWTABLE_HOOK_MAX +1 ];struct nft_hook *hook;
@@ -7615,7 +7622,8 @@ static int nft_flowtable_parse_hook(const struct nft_ctx *ctx,if (tb[NFTA_FLOWTABLE_HOOK_DEVS ]) { err =nf_tables_parse_netdev_hooks (ctx->net, tb[NFTA_FLOWTABLE_HOOK_DEVS ], - &flowtable_hook->list); + &flowtable_hook->list, + extack);if (err <0 )return err; }
@@ -7758,7 +7766,8 @@ static void nft_flowtable_hooks_destroy(struct list_head *hook_list) }static int nft_flowtable_update (struct nft_ctx *ctx,const struct nlmsghdr *nlh, -struct nft_flowtable *flowtable) +struct nft_flowtable *flowtable, +struct netlink_ext_ack *extack) {const struct nlattr *const *nla = ctx->nla;struct nft_flowtable_hook flowtable_hook;
@@ -7769,7 +7778,7 @@ static int nft_flowtable_update(struct nft_ctx *ctx, const struct nlmsghdr *nlh,int err; err =nft_flowtable_parse_hook (ctx, nla[NFTA_FLOWTABLE_HOOK ], - &flowtable_hook, flowtable, false); + &flowtable_hook, flowtable, extack, false);if (err <0 )return err;
@@ -7874,7 +7883,7 @@ static int nf_tables_newflowtable(struct sk_buff *skb,nft_ctx_init (&ctx, net, skb, info->nlh, family, table,NULL , nla); -return nft_flowtable_update (&ctx, info->nlh, flowtable); +return nft_flowtable_update (&ctx, info->nlh, flowtable, extack); }nft_ctx_init (&ctx, net, skb, info->nlh, family, table,NULL , nla);
@@ -7915,7 +7924,7 @@ static int nf_tables_newflowtable(struct sk_buff *skb, goto err3; err =nft_flowtable_parse_hook (&ctx, nla[NFTA_FLOWTABLE_HOOK ], - &flowtable_hook, flowtable, true); + &flowtable_hook, flowtable, extack, true);if (err <0 ) goto err4;
@@ -7967,7 +7976,8 @@ static void nft_flowtable_hook_release(struct nft_flowtable_hook *flowtable_hook }static int nft_delflowtable_hook (struct nft_ctx *ctx, -struct nft_flowtable *flowtable) +struct nft_flowtable *flowtable, +struct netlink_ext_ack *extack) {const struct nlattr *const *nla = ctx->nla;struct nft_flowtable_hook flowtable_hook;
@@ -7977,7 +7987,7 @@ static int nft_delflowtable_hook(struct nft_ctx *ctx,int err; err =nft_flowtable_parse_hook (ctx, nla[NFTA_FLOWTABLE_HOOK ], - &flowtable_hook, flowtable, false); + &flowtable_hook, flowtable, extack, false);if (err <0 )return err;
@@ -8059,7 +8069,7 @@ static int nf_tables_delflowtable(struct sk_buff *skb,nft_ctx_init (&ctx, net, skb, info->nlh, family, table,NULL , nla);if (nla[NFTA_FLOWTABLE_HOOK ]) -return nft_delflowtable_hook (&ctx, flowtable); +return nft_delflowtable_hook (&ctx, flowtable, extack);if (flowtable->use >0 ) {NL_SET_BAD_ATTR (extack, attr);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v5 3/7 netfilter: nf_tables: rename function to destroy hook list
Rename nft_flowtable_hooks_destroy() by nft_hooks_destroy() to prepare for netdev chain device updates.
---
v5: no changes.
net/netfilter/nf_tables_api.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +4 -4
@@ -7779,7 +7779,7 @@ static int nft_register_flowtable_net_hooks(struct net *net,return err; } -static void nft_flowtable_hooks_destroy (struct list_head *hook_list) +static void nft_hooks_destroy (struct list_head *hook_list) {struct nft_hook *hook, *next;
@@ -7960,7 +7960,7 @@ static int nf_tables_newflowtable(struct sk_buff *skb, &flowtable->hook_list, flowtable);if (err <0 ) { -nft_flowtable_hooks_destroy (&flowtable->hook_list); +nft_hooks_destroy (&flowtable->hook_list); goto err4; }
@@ -8794,7 +8794,7 @@ static void nft_commit_release(struct nft_trans *trans)case NFT_MSG_DELFLOWTABLE :case NFT_MSG_DESTROYFLOWTABLE :if (nft_trans_flowtable_update (trans)) -nft_flowtable_hooks_destroy (&nft_trans_flowtable_hooks (trans)); +nft_hooks_destroy (&nft_trans_flowtable_hooks (trans));else nf_tables_flowtable_destroy (nft_trans_flowtable (trans));break ;
@@ -9447,7 +9447,7 @@ static void nf_tables_abort_release(struct nft_trans *trans)break ;case NFT_MSG_NEWFLOWTABLE :if (nft_trans_flowtable_update (trans)) -nft_flowtable_hooks_destroy (&nft_trans_flowtable_hooks (trans)); +nft_hooks_destroy (&nft_trans_flowtable_hooks (trans));else nf_tables_flowtable_destroy (nft_trans_flowtable (trans));break ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v5 6/7 netfilter: nf_tables: allow to create netdev chain without device
In reply to Pablo Neira AyusoRelax netdev chain creation to allow for loading the ruleset, then adding/deleting devices at a later stage. Hardware offload does not support for this feature yet.
---
v5: no changes.
net/netfilter/nf_tables_api.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
net/netfilter/nf_tables_api.c +11 -12
@@ -2024,10 +2024,9 @@ struct nft_chain_hook {struct list_head list; }; -static int nft_chain_parse_netdev (struct net *net, -struct nlattr *tb[], +static int nft_chain_parse_netdev (struct net *net,struct nlattr *tb[],struct list_head *hook_list, -struct netlink_ext_ack *extack) +struct netlink_ext_ack *extack,u32 flags) {struct nft_hook *hook;int err;
@@ -2046,12 +2045,12 @@ static int nft_chain_parse_netdev(struct net *net,if (err <0 )return err; -if (list_empty (hook_list)) -return -EINVAL ; - }else { -return -EINVAL ; } +if (flags &NFT_CHAIN_HW_OFFLOAD && +list_empty (hook_list)) +return -EINVAL ; +return 0 ; }
@@ -2059,7 +2058,7 @@ static int nft_chain_parse_hook(struct net *net,struct nft_base_chain *basechain, const struct nlattr * const nla[], struct nft_chain_hook *hook, u8 family, - struct netlink_ext_ack *extack) + u32 flags, struct netlink_ext_ack *extack) { struct nftables_pernet *nft_net = nft_pernet(net);struct nlattr *ha[NFTA_HOOK_MAX +1 ];
@@ -2119,7 +2118,7 @@ static int nft_chain_parse_hook(struct net *net,INIT_LIST_HEAD (&hook->list);if (nft_base_chain_netdev (family, hook->num)) { - err =nft_chain_parse_netdev (net, ha, &hook->list, extack); + err =nft_chain_parse_netdev (net, ha, &hook->list, extack, flags);if (err <0 ) {module_put (type->owner);return err;
@@ -2262,7 +2261,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,if (flags &NFT_CHAIN_BINDING )return -EOPNOTSUPP ; - err =nft_chain_parse_hook (net,NULL , nla, &hook, family, + err =nft_chain_parse_hook (net,NULL , nla, &hook, family, flags, extack);if (err <0 )return err;
@@ -2407,7 +2406,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, basechain =nft_base_chain (chain); err =nft_chain_parse_hook (ctx->net, basechain, nla, &hook, - ctx->family, extack); + ctx->family, flags, extack);if (err <0 )return err;
@@ -2683,7 +2682,7 @@ static int nft_delchain_hook(struct nft_ctx *ctx, struct nft_chain *chain, basechain =nft_base_chain (chain); err =nft_chain_parse_hook (ctx->net, basechain, nla, &chain_hook, - ctx->family, extack); + ctx->family, chain->flags, extack);if (err <0 )return err;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v5 7/7 netfilter: nf_tables: remove artificial cap on maximum number of netdevices
In reply to Pablo Neira AyusoRemove NFT_NETDEVICE_MAX (256) artificial cap on the maximum number of netdevices that are allowed per chain/flowtable.
---
v5: no changes.
include/net/netfilter/nf_tables.h | 2 -- net/netfilter/nf_tables_api.c | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-)
include/net/netfilter/nf_tables.h +0 -2
@@ -1344,8 +1344,6 @@ struct nft_object_ops {int nft_register_obj (struct nft_object_type *obj_type);void nft_unregister_obj (struct nft_object_type *obj_type); -#define NFT_NETDEVICE_MAX 256 -/** * struct nft_flowtable - nf_tables flow table *
net/netfilter/nf_tables_api.c +1 -7
@@ -1978,7 +1978,7 @@ static int nf_tables_parse_netdev_hooks(struct net *net, {struct nft_hook *hook, *next;const struct nlattr *tmp; -int rem, n =0 , err; +int rem, err;nla_for_each_nested (tmp, attr, rem) {if (nla_type (tmp) !=NFTA_DEVICE_NAME ) {
@@ -1999,12 +1999,6 @@ static int nf_tables_parse_netdev_hooks(struct net *net, goto err_hook; }list_add_tail (&hook->list, hook_list); - n++; - -if (n ==NFT_NETDEVICE_MAX ) { - err = -EFBIG ; - goto err_hook; - } }return 0 ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v5 2/7 netfilter: nf_tables: do not send complete notification of deletions
In reply to Pablo Neira AyusoIn most cases, table, name and handle is sufficient for userspace to identify an object that has been deleted. Skipping unneeded fields in the netlink attributes in the message saves bandwidth (ie. less chances of hitting ENOBUFS).
Rules are an exception: the existing userspace monitor code relies on the rule definition. This exception can be removed by implementing a rule cache in userspace, this is already supported by the tracing infrastructure.
Regarding flowtables, incremental deletion of devices is possible. Skipping a full notification allows userspace to differentiate between flowtable removal and incremental removal of devices.
---
v5: no changes
net/netfilter/nf_tables_api.c | 70 +++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 19 deletions(-)
net/netfilter/nf_tables_api.c +51 -19
@@ -821,12 +821,20 @@ static int nf_tables_fill_table_info(struct sk_buff *skb, struct net *net, goto nla_put_failure;if (nla_put_string (skb,NFTA_TABLE_NAME , table->name) || -nla_put_be32 (skb,NFTA_TABLE_FLAGS , -htonl (table->flags &NFT_TABLE_F_MASK )) ||nla_put_be32 (skb,NFTA_TABLE_USE ,htonl (table->use)) ||nla_put_be64 (skb,NFTA_TABLE_HANDLE ,cpu_to_be64 (table->handle),NFTA_TABLE_PAD )) goto nla_put_failure; + +if (event ==NFT_MSG_DELTABLE ) { +nlmsg_end (skb, nlh); +return 0 ; + } + +if (nla_put_be32 (skb,NFTA_TABLE_FLAGS , +htonl (table->flags &NFT_TABLE_F_MASK ))) + goto nla_put_failure; +if (nft_table_has_owner (table) &&nla_put_be32 (skb,NFTA_TABLE_OWNER ,htonl (table->nlpid))) goto nla_put_failure;
@@ -1627,13 +1635,16 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net,if (!nlh) goto nla_put_failure; -if (nla_put_string (skb,NFTA_CHAIN_TABLE , table->name)) - goto nla_put_failure; -if (nla_put_be64 (skb,NFTA_CHAIN_HANDLE ,cpu_to_be64 (chain->handle), +if (nla_put_string (skb,NFTA_CHAIN_TABLE , table->name) || +nla_put_string (skb,NFTA_CHAIN_NAME , chain->name) || +nla_put_be64 (skb,NFTA_CHAIN_HANDLE ,cpu_to_be64 (chain->handle),NFTA_CHAIN_PAD )) goto nla_put_failure; -if (nla_put_string (skb,NFTA_CHAIN_NAME , chain->name)) - goto nla_put_failure; + +if (event ==NFT_MSG_DELCHAIN ) { +nlmsg_end (skb, nlh); +return 0 ; + }if (nft_is_base_chain (chain)) {const struct nft_base_chain *basechain =nft_base_chain (chain);
@@ -4157,6 +4168,12 @@ static int nf_tables_fill_set(struct sk_buff *skb, const struct nft_ctx *ctx,if (nla_put_be64 (skb,NFTA_SET_HANDLE ,cpu_to_be64 (set->handle),NFTA_SET_PAD )) goto nla_put_failure; + +if (event ==NFT_MSG_DELSET ) { +nlmsg_end (skb, nlh); +return 0 ; + } +if (set->flags !=0 )if (nla_put_be32 (skb,NFTA_SET_FLAGS ,htonl (set->flags))) goto nla_put_failure;
@@ -7162,13 +7179,20 @@ static int nf_tables_fill_obj_info(struct sk_buff *skb, struct net *net,if (nla_put_string (skb,NFTA_OBJ_TABLE , table->name) ||nla_put_string (skb,NFTA_OBJ_NAME , obj->key.name) || -nla_put_be32 (skb,NFTA_OBJ_TYPE ,htonl (obj->ops->type->type)) || -nla_put_be32 (skb,NFTA_OBJ_USE ,htonl (obj->use)) || -nft_object_dump (skb,NFTA_OBJ_DATA , obj, reset) ||nla_put_be64 (skb,NFTA_OBJ_HANDLE ,cpu_to_be64 (obj->handle),NFTA_OBJ_PAD )) goto nla_put_failure; +if (event ==NFT_MSG_DELOBJ ) { +nlmsg_end (skb, nlh); +return 0 ; + } + +if (nla_put_be32 (skb,NFTA_OBJ_TYPE ,htonl (obj->ops->type->type)) || +nla_put_be32 (skb,NFTA_OBJ_USE ,htonl (obj->use)) || +nft_object_dump (skb,NFTA_OBJ_DATA , obj, reset)) + goto nla_put_failure; +if (obj->udata &&nla_put (skb,NFTA_OBJ_USERDATA , obj->udlen, obj->udata)) goto nla_put_failure;
@@ -8097,9 +8121,16 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net,if (nla_put_string (skb,NFTA_FLOWTABLE_TABLE , flowtable->table->name) ||nla_put_string (skb,NFTA_FLOWTABLE_NAME , flowtable->name) || -nla_put_be32 (skb,NFTA_FLOWTABLE_USE ,htonl (flowtable->use)) ||nla_put_be64 (skb,NFTA_FLOWTABLE_HANDLE ,cpu_to_be64 (flowtable->handle), -NFTA_FLOWTABLE_PAD ) || +NFTA_FLOWTABLE_PAD )) + goto nla_put_failure; + +if (event ==NFT_MSG_DELFLOWTABLE && !hook_list) { +nlmsg_end (skb, nlh); +return 0 ; + } + +if (nla_put_be32 (skb,NFTA_FLOWTABLE_USE ,htonl (flowtable->use)) ||nla_put_be32 (skb,NFTA_FLOWTABLE_FLAGS ,htonl (flowtable->data.flags))) goto nla_put_failure;
@@ -8114,6 +8145,9 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net,if (!nest_devs) goto nla_put_failure; +if (!hook_list) + hook_list = &flowtable->hook_list; +list_for_each_entry_rcu (hook, hook_list, list) {if (nla_put_string (skb,NFTA_DEVICE_NAME , hook->ops.dev->name)) goto nla_put_failure;
@@ -8170,8 +8204,7 @@ static int nf_tables_dump_flowtable(struct sk_buff *skb,NFT_MSG_NEWFLOWTABLE ,NLM_F_MULTI |NLM_F_APPEND , table->family, - flowtable, - &flowtable->hook_list) < 0) + flowtable, NULL) < 0) goto done;nl_dump_check_consistent (cb,nlmsg_hdr (skb));
@@ -8266,7 +8299,7 @@ static int nf_tables_getflowtable(struct sk_buff *skb, err =nf_tables_fill_flowtable_info (skb2, net,NETLINK_CB (skb).portid, info->nlh->nlmsg_seq,NFT_MSG_NEWFLOWTABLE ,0 , family, - flowtable, &flowtable->hook_list); + flowtable,NULL );if (err <0 ) goto err_fill_flowtable_info;
@@ -8279,8 +8312,7 @@ static int nf_tables_getflowtable(struct sk_buff *skb,static void nf_tables_flowtable_notify (struct nft_ctx *ctx,struct nft_flowtable *flowtable, -struct list_head *hook_list, -int event) +struct list_head *hook_list,int event) {struct nftables_pernet *nft_net =nft_pernet (ctx->net);struct sk_buff *skb;
@@ -9340,7 +9372,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)nft_clear (net,nft_trans_flowtable (trans));nf_tables_flowtable_notify (&trans->ctx,nft_trans_flowtable (trans), - &nft_trans_flowtable (trans)->hook_list, +NULL ,NFT_MSG_NEWFLOWTABLE ); }nft_trans_destroy (trans);
@@ -9358,7 +9390,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)list_del_rcu (&nft_trans_flowtable (trans)->list);nf_tables_flowtable_notify (&trans->ctx,nft_trans_flowtable (trans), - &nft_trans_flowtable (trans)->hook_list, +NULL , trans->msg_type);nft_unregister_flowtable_net_hooks (net, &nft_trans_flowtable (trans)->hook_list);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v5 4/7 netfilter: nf_tables: support for adding new devices to an existing netdev chain
In reply to Pablo Neira AyusoThis patch allows users to add devices to an existing netdev chain.
---
v5: no need to specify neither _CHAIN_TYPE nor _HOOK attributes on chain updates.
(update nft_chain_parse_hook function).
include/net/netfilter/nf_tables.h | 6 + net/netfilter/nf_tables_api.c | 210 ++++++++++++++++++------------ 2 files changed, 135 insertions(+), 81 deletions(-)
include/net/netfilter/nf_tables.h +6 -0
@@ -1601,6 +1601,8 @@ struct nft_trans_chain {struct nft_stats __percpu *stats;u8 policy;u32 chain_id; +struct nft_base_chain *basechain; +struct list_head hook_list; };#define nft_trans_chain_update (trans) \
@@ -1613,6 +1615,10 @@ struct nft_trans_chain { (((struct nft_trans_chain *)trans->data)->policy)#define nft_trans_chain_id (trans) \ (((struct nft_trans_chain *)trans->data)->chain_id) +#define nft_trans_basechain (trans) \ + (((struct nft_trans_chain *)trans->data)->basechain) +#define nft_trans_chain_hooks (trans) \ + (((struct nft_trans_chain *)trans->data)->hook_list)struct nft_trans_table {bool update;
net/netfilter/nf_tables_api.c +129 -81
403 lines not on this page · raw message
Signature · 1 line
2.30.2