From: Patrick McHardy <kaber@trash.net>
Date: Tue, 2 Jun 2015 10:53:10 +0000 (+0200)
Subject: netlink_linearize: fix range cmp instruction generation
X-Git-Tag: v0.5~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5764e58f0e0b3ace1b1c1cdb5c149a6c679ff6d6;p=thirdparty%2Fnftables.git

netlink_linearize: fix range cmp instruction generation

The LHS expression is generated twice and the register not properly released.
Fix by calling netlink_gen_range() before generating the LHS.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index 9bef67b38..0a0b68648 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -203,6 +203,9 @@ static void netlink_gen_cmp(struct netlink_linearize_ctx *ctx,
 
 	assert(dreg == NFT_REG_VERDICT);
 
+	if (expr->right->ops->type == EXPR_RANGE)
+		return netlink_gen_range(ctx, expr, dreg);
+
 	sreg = get_register(ctx);
 	netlink_gen_expr(ctx, expr->left, sreg);
 
@@ -229,8 +232,6 @@ static void netlink_gen_cmp(struct netlink_linearize_ctx *ctx,
 		right = expr->right->prefix;
 		break;
 		}
-	case EXPR_RANGE:
-		return netlink_gen_range(ctx, expr, dreg);
 	default:
 		right = expr->right;
 	}