From ebb0dd15731d2782b6ade1a0904c2c8890e5b5aa Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 7 Mar 2016 17:38:23 +0100 Subject: netlink_delinearize: fix bogus offset w exthdr expressions Need to fetch the offset from the exthdr template. Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- src/netlink_linearize.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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, -- cgit v1.2.3