From 41abb7f7dda23ed522d3acec17d091e4d0eb8141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Falgueras=20Garc=C3=ADa?= Date: Fri, 26 Aug 2016 15:49:22 +0200 Subject: expr: immediate: Fix verdict comparison MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An immediate expression of type 'DATA_VERDICT' can have set a chain (jump or goto), in this cases we must compare its 'union nftnl_data_reg' using 'DATA_CHAIN' flag instead of 'DATA_VERDICT' Before this patch compare expressions "jump -> chain_a" and "jump -> chain_b" returns they are equals. Signed-off-by: Carlos Falgueras García Signed-off-by: Pablo Neira Ayuso --- src/expr/immediate.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/expr/immediate.c b/src/expr/immediate.c index cb8a81b..2fdae9c 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -326,13 +326,20 @@ static bool nftnl_expr_immediate_cmp(const struct nftnl_expr *e1, struct nftnl_expr_immediate *i1 = nftnl_expr_data(e1); struct nftnl_expr_immediate *i2 = nftnl_expr_data(e2); bool eq = true; + int type = DATA_NONE; if (e1->flags & (1 << NFTNL_EXPR_IMM_DREG)) eq &= (i1->dreg == i2->dreg); if (e1->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) - eq &= nftnl_data_reg_cmp(&i1->data, &i2->data, DATA_VERDICT); + if (e1->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) + type = DATA_CHAIN; + else + type = DATA_VERDICT; else if (e1->flags & (1 << NFTNL_EXPR_IMM_DATA)) - eq &= nftnl_data_reg_cmp(&i1->data, &i2->data, DATA_VALUE); + type = DATA_VALUE; + + if (type != DATA_NONE) + eq &= nftnl_data_reg_cmp(&i1->data, &i2->data, type); return eq; } -- cgit v1.2.3