summaryrefslogtreecommitdiffstats
path: root/src/netlink_linearize.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-02-16 18:33:16 +0000
committerPatrick McHardy <kaber@trash.net>2014-02-16 18:33:24 +0000
commit20162176b5def48a6203534313299e011a76b640 (patch)
treeb5dddc3735825df780179b6856931f75ae0ebf47 /src/netlink_linearize.c
parentf534b9a7ca87cd3b170b6bb22449e51361d2a9e3 (diff)
netlink_linearize: fix flagcmp op
Florian reports that flag comparisons generate incorrect instructions: $ nft --debug=netlink add rule filter output ct labels foo ip filter output 0 0 [ ct load labels => reg 1 ] [ bitwise reg 1 = (reg=1 & 0x00000001 0x00000000 0x00000000 0x00000000 ) ^ 0x00000000 0x00000000 0x00000000 0x00000000 ] [ cmp neq reg 1 0x00000001 0x00000000 0x00000000 0x00000000 ] The "cmp new" should compare to zero. This was broken by commit aae836a7 (src: use libnftables by using expr->right instead of zero. Slightly rearrange the code as well to prevent similar problems in the future. Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'src/netlink_linearize.c')
-rw-r--r--src/netlink_linearize.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index 332383af..e5fb536b 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -271,21 +271,20 @@ static void netlink_gen_flagcmp(struct netlink_linearize_ctx *ctx,
mpz_init_set_ui(zero, 0);
- nle = alloc_nft_expr("bitwise");
netlink_gen_raw_data(zero, expr->right->byteorder, len, &nld);
+ netlink_gen_data(expr->right, &nld2);
+
+ nle = alloc_nft_expr("bitwise");
nft_rule_expr_set_u32(nle, NFT_EXPR_BITWISE_SREG, sreg);
nft_rule_expr_set_u32(nle, NFT_EXPR_BITWISE_DREG, sreg);
nft_rule_expr_set_u32(nle, NFT_EXPR_BITWISE_LEN, len);
- netlink_gen_data(expr->right, &nld2);
nft_rule_expr_set(nle, NFT_EXPR_BITWISE_MASK, &nld2.value, nld2.len);
nft_rule_expr_set(nle, NFT_EXPR_BITWISE_XOR, &nld.value, nld.len);
nft_rule_add_expr(ctx->nlr, nle);
nle = alloc_nft_expr("cmp");
- netlink_gen_raw_data(zero, expr->right->byteorder, len, &nld);
nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_SREG, sreg);
nft_rule_expr_set_u32(nle, NFT_EXPR_CMP_OP, NFT_CMP_NEQ);
- netlink_gen_data(expr->right, &nld);
nft_rule_expr_set(nle, NFT_EXPR_CMP_DATA, nld.value, nld.len);
nft_rule_add_expr(ctx->nlr, nle);