Skip to content

Commit

Permalink
netfilter: nf_tables: extended netlink error reporting for expressions
Browse files Browse the repository at this point in the history
This patch extends 36dd1bc ("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.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
ummakynes committed Aug 2, 2020
1 parent 42f36eb commit 83d9dcb
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion net/netfilter/nf_tables_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
};

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 83d9dcb

Please sign in to comment.