From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH nft 4/5] netlink: tell user if libnftnl detected unknown attributes/features
Date: Mon, 7 Oct 2024 11:49:37 +0200 [thread overview]
Message-ID: <20241007094943.7544-5-fw@strlen.de> (raw)
In-Reply-To: <20241007094943.7544-1-fw@strlen.de>
Add a warning in case libnftl failed to decode all attributes coming
from the kernel.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
include/netlink.h | 1 +
src/netlink_delinearize.c | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/include/netlink.h b/include/netlink.h
index cf7ba3693885..66fd6b414a0b 100644
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -42,6 +42,7 @@ struct netlink_parse_ctx {
struct netlink_ctx *nlctx;
bool inner;
uint8_t inner_reg;
+ uint8_t incomplete_exprs;
};
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index e3d9cfbbede5..5c7c11352abf 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -1915,6 +1915,23 @@ static const struct expr_handler netlink_parsers[] = {
{ .name = "synproxy", .parse = netlink_parse_synproxy },
};
+static void netlink_incomplete_expr(struct netlink_parse_ctx *ctx)
+{
+ static const char incomplete[] = "# Unknown features used (old nft version?)";
+ struct stmt *stmt;
+ struct expr *e;
+
+ netlink_error(ctx, &ctx->rule->location, incomplete);
+
+ e = constant_expr_alloc(&ctx->rule->location, &string_type,
+ BYTEORDER_HOST_ENDIAN,
+ sizeof(incomplete) * BITS_PER_BYTE, incomplete);
+
+ __mpz_switch_byteorder(e->value, sizeof(incomplete));
+ stmt = expr_stmt_alloc(&ctx->rule->location, e);
+ rule_stmt_append(ctx->rule, stmt);
+}
+
static int netlink_parse_expr(const struct nftnl_expr *nle,
struct netlink_parse_ctx *ctx)
{
@@ -1947,6 +1964,10 @@ static int netlink_parse_rule_expr(struct nftnl_expr *nle, void *arg)
err = netlink_parse_expr(nle, ctx);
if (err < 0)
return err;
+
+ if (!nftnl_expr_complete(nle))
+ ctx->incomplete_exprs++;
+
if (ctx->stmt != NULL) {
rule_stmt_append(ctx->rule, ctx->stmt);
ctx->stmt = NULL;
@@ -3508,6 +3529,9 @@ struct rule *netlink_delinearize_rule(struct netlink_ctx *ctx,
nftnl_expr_foreach(nlr, netlink_parse_rule_expr, pctx);
+ if (pctx->incomplete_exprs)
+ netlink_incomplete_expr(pctx);
+
rule_parse_postprocess(pctx, pctx->rule);
netlink_release_registers(pctx);
return pctx->rule;
--
2.45.2
next prev parent reply other threads:[~2024-10-07 10:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 9:49 [RFC libnftnl/nft 0/5] nftables: indicate presence of unsupported netlink attributes Florian Westphal
2024-10-07 9:49 ` [PATCH libnftnl 1/5] expr: add and use incomplete tag Florian Westphal
2024-10-08 11:13 ` Pablo Neira Ayuso
2024-10-08 12:17 ` Florian Westphal
2024-10-08 14:43 ` Pablo Neira Ayuso
2024-10-08 16:11 ` Florian Westphal
2024-10-07 9:49 ` [PATCH libnftnl 2/5] sets: " Florian Westphal
2024-10-07 9:49 ` [PATCH libnftnl 3/5] libnftnl: add api to query dissection state Florian Westphal
2024-10-07 9:49 ` Florian Westphal [this message]
2024-10-07 9:49 ` [PATCH nft 5/5] sets: inform user when set definition contains unknown attributes Florian Westphal
2024-10-16 17:07 ` [RFC libnftnl/nft 0/5] nftables: indicate presence of unsupported netlink attributes Phil Sutter
2024-10-16 18:34 ` Pablo Neira Ayuso
2024-10-16 19:04 ` Phil Sutter
2024-10-16 19:41 ` Jan Engelhardt
2024-10-16 19:28 ` Jan Engelhardt
2024-10-16 20:05 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241007094943.7544-5-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).