From: Carlos Falgueras García <carlosfg@riseup.net>
Date: Wed, 24 Aug 2016 12:22:16 +0000 (+0200)
Subject: expr: data_reg: Fix DATA_CHAIN comparison
X-Git-Tag: libnftnl-1.0.7~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54fc1f15cc8a14c333a216e93a8e2a3d1cbca67e;p=thirdparty%2Flibnftnl.git

expr: data_reg: Fix DATA_CHAIN comparison

Split DATA_VERDICT and DATA_CHAIN comparison. A verdict can have a NULL
chain (accept, drop, etc) so segfault will happen when strcmp is called.

Signed-off-by: Carlos Falgueras García <carlosfg@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index a954e953..395e9f65 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -387,6 +387,7 @@ bool nftnl_data_reg_cmp(const union nftnl_data_reg *r1,
 		return	r1->len == r2->len &&
 			!memcmp(r1->val, r2->val, r1->len);
 	case DATA_VERDICT:
+		return	r1->verdict == r2->verdict;
 	case DATA_CHAIN:
 		return	r1->verdict == r2->verdict &&
 			!strcmp(r1->chain, r2->chain);