|
 |
ba04b3 |
From ed405d0eafc7b1f71013cf42f9ed550d64ec56c5 Mon Sep 17 00:00:00 2001
|
|
|
ba04b3 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
ba04b3 |
Date: Wed, 6 Jun 2018 10:44:43 +0200
|
|
|
ba04b3 |
Subject: [PATCH] src: avoid errouneous assert with map+concat
|
|
|
ba04b3 |
|
|
|
ba04b3 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1540917
|
|
|
ba04b3 |
Upstream Status: nftables commit 483e5ea7167e1
|
|
|
ba04b3 |
|
|
|
ba04b3 |
commit 483e5ea7167e1537accf4cb083b88a8beea8f834
|
|
|
ba04b3 |
Author: Florian Westphal <fw@strlen.de>
|
|
|
ba04b3 |
Date: Tue Mar 27 09:29:54 2018 +0200
|
|
|
ba04b3 |
|
|
|
ba04b3 |
src: avoid errouneous assert with map+concat
|
|
|
ba04b3 |
|
|
|
ba04b3 |
Phil reported following assert:
|
|
|
ba04b3 |
|
|
|
ba04b3 |
add rule ip6 f o mark set ip6 saddr . ip6 daddr . tcp dport \
|
|
|
ba04b3 |
map { dead::beef . f00::. 22 : 1 }
|
|
|
ba04b3 |
nft: netlink_linearize.c:655: netlink_gen_expr: Assertion `dreg < ctx->reg_low' failed.
|
|
|
ba04b3 |
|
|
|
ba04b3 |
This happens because "mark set" will allocate one register (the dreg),
|
|
|
ba04b3 |
but netlink_gen_concat_expr will populate a lot more register space if
|
|
|
ba04b3 |
the concat expression strings a lot of expressions together.
|
|
|
ba04b3 |
|
|
|
ba04b3 |
As the assert is useful pseudo-reserve the register space as per
|
|
|
ba04b3 |
concat->len and undo after generating the expressions.
|
|
|
ba04b3 |
|
|
|
ba04b3 |
Reported-by: Phil Sutter <phil@nwl.cc>
|
|
|
ba04b3 |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
ba04b3 |
---
|
|
|
ba04b3 |
src/netlink_linearize.c | 8 ++++++++
|
|
|
ba04b3 |
1 file changed, 8 insertions(+)
|
|
|
ba04b3 |
|
|
|
ba04b3 |
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
|
|
|
ba04b3 |
index a268dcc..e9a4515 100644
|
|
|
ba04b3 |
--- a/src/netlink_linearize.c
|
|
|
ba04b3 |
+++ b/src/netlink_linearize.c
|
|
|
ba04b3 |
@@ -243,6 +243,7 @@ static void netlink_gen_map(struct netlink_linearize_ctx *ctx,
|
|
|
ba04b3 |
{
|
|
|
ba04b3 |
struct nftnl_expr *nle;
|
|
|
ba04b3 |
enum nft_registers sreg;
|
|
|
ba04b3 |
+ int regspace = 0;
|
|
|
ba04b3 |
|
|
|
ba04b3 |
assert(expr->mappings->ops->type == EXPR_SET_REF);
|
|
|
ba04b3 |
|
|
|
ba04b3 |
@@ -251,7 +252,14 @@ static void netlink_gen_map(struct netlink_linearize_ctx *ctx,
|
|
|
ba04b3 |
else
|
|
|
ba04b3 |
sreg = dreg;
|
|
|
ba04b3 |
|
|
|
ba04b3 |
+ /* suppress assert in netlink_gen_expr */
|
|
|
ba04b3 |
+ if (expr->map->ops->type == EXPR_CONCAT) {
|
|
|
ba04b3 |
+ regspace = netlink_register_space(expr->map->len);
|
|
|
ba04b3 |
+ ctx->reg_low += regspace;
|
|
|
ba04b3 |
+ }
|
|
|
ba04b3 |
+
|
|
|
ba04b3 |
netlink_gen_expr(ctx, expr->map, sreg);
|
|
|
ba04b3 |
+ ctx->reg_low -= regspace;
|
|
|
ba04b3 |
|
|
|
ba04b3 |
nle = alloc_nft_expr("lookup");
|
|
|
ba04b3 |
netlink_put_register(nle, NFTNL_EXPR_LOOKUP_SREG, sreg);
|
|
|
ba04b3 |
--
|
|
|
ba04b3 |
1.8.3.1
|
|
|
ba04b3 |
|