From: Florian Westphal <fw@strlen.de>
Date: Mon, 7 Mar 2016 16:38:23 +0000 (+0100)
Subject: netlink_delinearize: fix bogus offset w exthdr expressions
X-Git-Tag: v0.6~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebb0dd15731d2782b6ade1a0904c2c8890e5b5aa;p=thirdparty%2Fnftables.git

netlink_delinearize: fix bogus offset w exthdr expressions

Need to fetch the offset from the exthdr template.

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index 07f70e06..49b46760 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -320,19 +320,24 @@ static void netlink_gen_range(struct netlink_linearize_ctx *ctx,
 
 static void payload_shift_value(const struct expr *left, struct expr *right)
 {
+	unsigned int offset;
+
 	if (right->ops->type != EXPR_VALUE)
 		return;
 
 	switch (left->ops->type) {
 	case EXPR_PAYLOAD:
+		offset = left->payload.offset;
+		break;
 	case EXPR_EXTHDR:
+		offset = left->exthdr.tmpl->offset;
 		break;
 	default:
 		return;
 	}
 
 	mpz_lshift_ui(right->value,
-			payload_shift_calc(left, left->payload.offset));
+			payload_shift_calc(left, offset));
 }
 
 static struct expr *netlink_gen_prefix(struct netlink_linearize_ctx *ctx,