improve error reporting
Subsystems (2)
Pablo Neira Ayuso
maintainercover improve error reporting
Hi,
This is a small batch to improve error reporting:
Patch #1 allows for location-based error reporting in expressions, eg.
# nft add rule x y jump z
Error: Could not process rule: No such file or directory
add rule x y jump z
^^^^^^Patch #2 replaces EBUSY by EEXIST in several scenarios that are reported
to cause confusion among users.
Pablo Neira Ayuso (2):
netfilter: nf_tables: extended netlink error reporting for expressions
netfilter: nf_tables: report EEXIST on overlaps
net/netfilter/nf_tables_api.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: nf_tables: extended netlink error reporting for expressions
This patch extends 36dd1bcc07e5 ("netfilter: nf_tables: initial support for extended ACK reporting") to include netlink extended error reporting for expressions. This allows userspace to identify what rule expression is triggering the error.
--- net/netfilter/nf_tables_api.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +6 -1
@@ -2509,6 +2509,7 @@ int nft_expr_dump(struct sk_buff *skb, unsigned int attr,struct nft_expr_info {const struct nft_expr_ops *ops; +const struct nlattr *attr;struct nlattr *tb[NFT_EXPR_MAXATTR +1 ]; };
@@ -2556,7 +2557,9 @@ static int nf_tables_expr_parse(const struct nft_ctx *ctx, }else ops = type->ops; + info->attr = nla; info->ops = ops; +return 0 ; err1:
@@ -3214,8 +3217,10 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk, expr =nft_expr_first (rule);for (i =0 ; i < n; i++) { err =nf_tables_newexpr (&ctx, &info[i], expr); -if (err <0 ) +if (err <0 ) { +NL_SET_BAD_ATTR (extack, info[i].attr); goto err2; + }if (info[i].ops->validate)nft_validate_state_update (net,NFT_VALIDATE_NEED );
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: nf_tables: report EEXIST on overlaps
In reply to Pablo Neira AyusoReplace EBUSY by EEXIST in the following cases:
- If the user adds a chain with a different configuration such as different type, hook and priority.
- If the user adds a non-base chain that clashes with an existing basechain.
- If the user adds a { key : value } mapping element and the key exists but the value differs.
- If the device already belongs to an existing flowtable.
--- net/netfilter/nf_tables_api.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
net/netfilter/nf_tables_api.c +7 -9
@@ -2097,7 +2097,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,if (nla[NFTA_CHAIN_HOOK ]) {if (!nft_is_base_chain (chain)) -return -EBUSY ; +return -EEXIST ; err =nft_chain_parse_hook (ctx->net, nla, &hook, ctx->family, false);
@@ -2107,21 +2107,21 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, basechain =nft_base_chain (chain);if (basechain->type != hook.type) {nft_chain_release_hook (&hook); -return -EBUSY ; +return -EEXIST ; }if (ctx->family ==NFPROTO_NETDEV ) {if (!nft_hook_list_equal (&basechain->hook_list, &hook.list)) {nft_chain_release_hook (&hook); -return -EBUSY ; +return -EEXIST ; } }else { ops = &basechain->ops;if (ops->hooknum != hook.num || ops->priority != hook.priority) {nft_chain_release_hook (&hook); -return -EBUSY ; +return -EEXIST ; } }nft_chain_release_hook (&hook);
@@ -5262,10 +5262,8 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,if (nft_set_ext_exists (ext,NFT_SET_EXT_DATA ) ^nft_set_ext_exists (ext2,NFT_SET_EXT_DATA ) ||nft_set_ext_exists (ext,NFT_SET_EXT_OBJREF ) ^ -nft_set_ext_exists (ext2,NFT_SET_EXT_OBJREF )) { - err = -EBUSY ; +nft_set_ext_exists (ext2,NFT_SET_EXT_OBJREF )) goto err_element_clash; - } if ((nft_set_ext_exists(ext, NFT_SET_EXT_DATA) && nft_set_ext_exists(ext2, NFT_SET_EXT_DATA) && memcmp(nft_set_ext_data(ext),
@@ -5273,7 +5271,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, (nft_set_ext_exists (ext,NFT_SET_EXT_OBJREF ) &&nft_set_ext_exists (ext2,NFT_SET_EXT_OBJREF ) && *nft_set_ext_obj(ext) != *nft_set_ext_obj(ext2))) - err = -EBUSY; + goto err_element_clash; else if (!(nlmsg_flags & NLM_F_EXCL)) err =0 ; }else if (err == -ENOTEMPTY ) {
@@ -6423,7 +6421,7 @@ static int nft_register_flowtable_net_hooks(struct net *net,list_for_each_entry (hook2, &ft->hook_list, list) {if (hook->ops.dev == hook2->ops.dev && hook->ops.pf == hook2->ops.pf) { - err = -EBUSY ; + err = -EEXIST ; goto err_unregister_net_hooks; } }
Signature · 1 line
2.20.1