From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 26 Jan 2022 22:10:51 +0000 (+0100)
Subject: optimize: check for payload base and offset when searching for mergers
X-Git-Tag: v1.0.2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fa14396e6e60bafc4718e18a23073ff0276b53b;p=thirdparty%2Fnftables.git

optimize: check for payload base and offset when searching for mergers

Extend the existing checks to cover the payload base and offset.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/optimize.c b/src/optimize.c
index 9a93e3b8..5882f3bd 100644
--- a/src/optimize.c
+++ b/src/optimize.c
@@ -40,6 +40,10 @@ static bool __expr_cmp(const struct expr *expr_a, const struct expr *expr_b)
 
 	switch (expr_a->etype) {
 	case EXPR_PAYLOAD:
+		if (expr_a->payload.base != expr_b->payload.base)
+			return false;
+		if (expr_a->payload.offset != expr_b->payload.offset)
+			return false;
 		if (expr_a->payload.desc != expr_b->payload.desc)
 			return false;
 		if (expr_a->payload.tmpl != expr_b->payload.tmpl)